motor-admin 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5799ce999fa943638fa7c4d655400c1418ee80977bf47f64a71e6d5c496d02de
-  data.tar.gz: da99ec7b1c48708d983b663a7f9cb79b6d0e270b2fc9f5538a8121cfabdbc209
+  metadata.gz: 2f18c5fae6ca2c70b739f68d0a9b45f456b6c9f9592b4c44d216210a067b2e33
+  data.tar.gz: 4a65316ecce576b9de027fe93ff14bf9307826269af771fbfc9a7bbf3699f051
 SHA512:
-  metadata.gz: c5fc31a79b01ad0e716700a7c3daed980b293d13081294d1013918cce6f4d24cf4c104e0c44144cde225fd3b1ce07253f9b3ddaf44f1eca2252a01ff9124c52e
-  data.tar.gz: efca3a6d85ce6e33c83a63f3cd5addbd75b2baf099bd96c5efbac40445520a7725d68a5c3d0564792f06bdf12fed8958b13a6189047303d3c77f7f0af0ff0bd4
+  metadata.gz: f51029e47fe84f67f34ced365523f2214c44986f241ad35a77405f067a556bbca8ca124cb09812b007a709101729ae3dfc35aa94284c46dbbf2f63a990459001
+  data.tar.gz: 555b5570c50258d3ee00a317795868cee3281e0d3675d894e25773f26977d21d40781b031a4e3835469fa580d39b3e1ba5b87f11dcad83986b0bd144f612bc5c

data/app/controllers/concerns/motor/wrap_io_params.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Motor
+  module WrapIoParams
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :wrap_io_params, only: %i[update create]
+    end
+
+    private
+
+    def wrap_io_params(hash = params)
+      hash.each do |key, value|
+        if key == 'io'
+          hash[key] = StringIO.new(value.encode('ISO-8859-1'))
+        elsif value.is_a?(ActionController::Parameters)
+          wrap_io_params(value)
+        end
+      end
+
+      hash
+    end
+  end
+end

data/app/controllers/motor/active_storage_attachments_controller.rb

@@ -2,16 +2,15 @@
 
 module Motor
   class ActiveStorageAttachmentsController < ApiBaseController
+    include Motor::WrapIoParams
+
     wrap_parameters :data, except: %i[include fields]
 
     load_and_authorize_resource :attachment, class: 'ActiveStorage::Attachment', parent: false
 
     def create
       if attachable?(@attachment.record)
-        @attachment.record.public_send(@attachment.name).attach(
-          io: StringIO.new(params.dig(:data, :file, :io).to_s.encode('ISO-8859-1')),
-          filename: params.dig(:data, :file, :filename)
-        )
+        @attachment.record.public_send(@attachment.name).attach(file_params)
 
         head :ok
       else
@@ -26,8 +25,16 @@ module Motor
         record.respond_to?("#{@attachment.name}_attachments=")
     end
 
+    def file_params
+      params.require(:data).require(:file).permit(:io, :filename).to_h
+    end
+
     def attachment_params
-      params.require(:data).except(:file).permit!
+      if params[:data].present?
+        params.require(:data).except(:file).permit!
+      else
+        {}
+      end
     end
   end
 end

data/app/controllers/motor/data_controller.rb

@@ -2,13 +2,14 @@
 
 module Motor
   class DataController < ApiBaseController
+    include Motor::WrapIoParams
+
     INSTANCE_VARIABLE_NAME = 'resource'
 
     wrap_parameters :data, except: %i[include fields]
 
     before_action :load_and_authorize_resource
     before_action :load_and_authorize_association
-    before_action :wrap_io_params
 
     def index
       @resources = Motor::ApiQuery.call(@resources, params)
@@ -27,12 +28,20 @@ module Motor
       @resource.save!
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@resource, params) }
+    rescue ActiveRecord::RecordInvalid
+      render json: { errors: @resource.errors }, status: :unprocessable_entity
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def update
       @resource.update!(resource_params)
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@resource, params) }
+    rescue ActiveRecord::RecordInvalid
+      render json: { errors: @resource.errors }, status: :unprocessable_entity
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def destroy
@@ -77,6 +86,8 @@ module Motor
         self,
         options
       ).load_and_authorize_resource
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def load_and_authorize_association
@@ -96,6 +107,8 @@ module Motor
       else
         render json: { message: 'Unknown association' }, status: :not_found
       end
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def resource_params
@@ -105,17 +118,5 @@ module Motor
         {}
       end
     end
-
-    def wrap_io_params(hash = params)
-      hash.each do |key, value|
-        if key == 'io'
-          hash[key] = StringIO.new(value.encode('ISO-8859-1'))
-        elsif value.is_a?(ActionController::Parameters)
-          wrap_io_params(value)
-        end
-      end
-
-      hash
-    end
   end
 end

data/lib/motor/build_schema/load_from_rails.rb

@@ -133,7 +133,7 @@ module Motor
           column_type: is_attachment ? 'file' : 'integer',
           access_type: access_type,
           default_value: default_attrs[column_name],
-          validators: fetch_validators(model, column_name),
+          validators: fetch_validators(model, column_name, ref),
           format: {},
           reference: {
             name: name,
@@ -172,23 +172,34 @@ module Motor
         end.compact
       end
 
-      def fetch_validators(model, column_name)
-        model.validators_on(column_name).map do |validator|
-          case validator
-          when ActiveModel::Validations::InclusionValidator
-            { includes: validator.send(:delimiter) }
-          when ActiveRecord::Validations::PresenceValidator
-            { required: true }
-          when ActiveModel::Validations::FormatValidator
-            { format: JsRegex.new(validator.options[:with]).to_h.slice(:source, :options) }
-          when ActiveRecord::Validations::LengthValidator
-            { length: validator.options }
-          when ActiveModel::Validations::NumericalityValidator
-            { numeric: validator.options }
+      def fetch_validators(model, column_name, reflection = nil)
+        validators =
+          if reflection&.belongs_to? && !reflection.options[:optional]
+            [{ required: true }]
           else
-            next
+            []
           end
+
+        validators += model.validators_on(column_name).map do |validator|
+          build_validator_hash(validator)
         end.compact
+
+        validators.uniq
+      end
+
+      def build_validator_hash(validator)
+        case validator
+        when ActiveModel::Validations::InclusionValidator
+          { includes: validator.send(:delimiter) }
+        when ActiveRecord::Validations::PresenceValidator
+          { required: true }
+        when ActiveModel::Validations::FormatValidator
+          { format: JsRegex.new(validator.options[:with]).to_h.slice(:source, :options) }
+        when ActiveRecord::Validations::LengthValidator
+          { length: validator.options }
+        when ActiveModel::Validations::NumericalityValidator
+          { numeric: validator.options }
+        end
       end
 
       def eager_load_models!

data/lib/motor/build_schema/persist_resource_configs.rb

@@ -90,9 +90,9 @@ module Motor
         return preferences if new_prefs[configs_name].blank?
 
         normalized_configs = public_send("normalize_#{configs_name}",
-                                         default_prefs[:actions],
-                                         existing_prefs.fetch(:actions, []),
-                                         new_prefs.fetch(:actions, []))
+                                         default_prefs[configs_name],
+                                         existing_prefs.fetch(configs_name, []),
+                                         new_prefs.fetch(configs_name, []))
 
         preferences[configs_name] = normalized_configs
 

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -5,9 +5,9 @@
   "fonts/ionicons.ttf?v=3.0.0-alpha.3": "fonts/ionicons.ttf",
   "fonts/ionicons.woff2?v=3.0.0-alpha.3": "fonts/ionicons.woff2",
   "fonts/ionicons.woff?v=3.0.0-alpha.3": "fonts/ionicons.woff",
-  "main-4da1a5102d7bc66aefd0.css.gz": "main-4da1a5102d7bc66aefd0.css.gz",
-  "main-4da1a5102d7bc66aefd0.js.LICENSE.txt": "main-4da1a5102d7bc66aefd0.js.LICENSE.txt",
-  "main-4da1a5102d7bc66aefd0.js.gz": "main-4da1a5102d7bc66aefd0.js.gz",
-  "main.css": "main-4da1a5102d7bc66aefd0.css",
-  "main.js": "main-4da1a5102d7bc66aefd0.js"
+  "main-482137e0bc1ba9f875dc.css.gz": "main-482137e0bc1ba9f875dc.css.gz",
+  "main-482137e0bc1ba9f875dc.js.LICENSE.txt": "main-482137e0bc1ba9f875dc.js.LICENSE.txt",
+  "main-482137e0bc1ba9f875dc.js.gz": "main-482137e0bc1ba9f875dc.js.gz",
+  "main.css": "main-482137e0bc1ba9f875dc.css",
+  "main.js": "main-482137e0bc1ba9f875dc.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.29
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -132,6 +132,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/concerns/motor/wrap_io_params.rb
 - app/controllers/motor/active_storage_attachments_controller.rb
 - app/controllers/motor/alerts_controller.rb
 - app/controllers/motor/api_base_controller.rb
@@ -214,8 +215,8 @@ files:
 - lib/motor/ui_configs.rb
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-4da1a5102d7bc66aefd0.css.gz
-- ui/dist/main-4da1a5102d7bc66aefd0.js.gz
+- ui/dist/main-482137e0bc1ba9f875dc.css.gz
+- ui/dist/main-482137e0bc1ba9f875dc.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: