motor-admin 0.2.28 → 0.2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 890e9157c807073892957ebdab77377f9cf36b91f5e00f04fd128f5591764fd2
-  data.tar.gz: 41aa043a58ec68f713bf2a75e21464eb8bad07f000cabacd9fa364e821329414
+  metadata.gz: 4f3ed23b54a556070e9c4ba1d46c5a9ab8fe32be08435afe2340ffb7e5ed885b
+  data.tar.gz: c627fbb99941389e0da067583cde8d4d32e0e0325f94a55a03ee5bd50c630384
 SHA512:
-  metadata.gz: d5ea14f4ecd4d9deaadac11b12da0d5d689bf8256505a17b632a30a6758fb61e84650f6b997e352f77ccf91a139242aa04f81661d352cfb72087112304383756
-  data.tar.gz: a4ea641247486ee81239eda91e209e421082d8d45fe0dfffde355749f7e273b1f02964f3e668904a493610b38885da87928dbcee151a5c647c60675d84eb6e6a
+  metadata.gz: 624c0c4e27ac1aac78128dc22455dfc1029abe81d06dc1dd7994c96f8660df561d213e4ad8b569dc331d1eb8655e41d1ee075ea5dc0406e8934727265f7dbe66
+  data.tar.gz: 783def6366713e85cdfb8bda8cfb9a6843dce7a64e9859409c25b0163fa8ca7b9ecfe212eb20269179b2ca20c4f100db29aa2e570c477735b4f31283e3e748ca

data/README.md

@@ -38,6 +38,7 @@ $ rails motor:install && rake db:migrate
 * [I18n](#i18n)
 * [Optimized for mobile](#optimized-for-mobile)
 * [Configurations sync between environments](#configurations-sync)
+* [Authentication](#authentication)
 
 ## [Pro](https://www.getmotoradmin.com/pro)
 

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/api_query/sort.rb

@@ -45,7 +45,18 @@ module Motor
 
           arel_column = reflection_model.arel_table[field]
 
-          direction.present? ? arel_column.desc : arel_column.asc
+          arel_direction = direction.present? ? arel_column.desc : arel_column.asc
+
+          maybe_add_null_last(model, arel_direction)
+        end
+      end
+
+      def maybe_add_null_last(model, arel_direction)
+        if arel_direction.respond_to?(:nulls_last) &&
+           model.connection.class.name == 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
+          arel_direction.nulls_last
+        else
+          arel_direction
         end
       end
     end

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/find_icon.rb

@@ -87,8 +87,8 @@ module Motor
       'district' => 'building-community',
       'community' => 'building-community',
       'activity' => 'activity',
-      'invoice' => 'invoice',
-      'settlement' => 'invoice',
+      'invoice' => 'file-invoice',
+      'settlement' => 'file-invoice',
       'state' => 'map',
       'note' => 'note',
       'order' => 'truck-delivery',

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.32'
 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-75c26326d4058b8611c3.css.gz": "main-75c26326d4058b8611c3.css.gz",
+  "main-75c26326d4058b8611c3.js.LICENSE.txt": "main-75c26326d4058b8611c3.js.LICENSE.txt",
+  "main-75c26326d4058b8611c3.js.gz": "main-75c26326d4058b8611c3.js.gz",
+  "main.css": "main-75c26326d4058b8611c3.css",
+  "main.js": "main-75c26326d4058b8611c3.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.32
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-20 00:00:00.000000000 Z
+date: 2021-11-30 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-75c26326d4058b8611c3.css.gz
+- ui/dist/main-75c26326d4058b8611c3.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: