motor-admin 0.2.66 → 0.2.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 399871db5e31a27973c4c7ba3b21d168b2d0581daf211f25ecbeadaf481cdfc2
-  data.tar.gz: fdba5bc869b246e574cc2866d88c5070f4fe21fd1b4b797929ea79578c361897
+  metadata.gz: ecd151cc5a37089827f85405b84aefc194a57dc95000ea8c5e9372ed5cdfc00b
+  data.tar.gz: 283a02208d984f0ec91201774944bbf80b0eb3b8a4c61ced9d5f585e40931982
 SHA512:
-  metadata.gz: bd3dd275d2f88f2f11b05a15ee3efb6293abda137d88b6dc2a9c80c87344993e7a7c2f4cf1044269f71146ee487fec7e86882387a0775c60b3132ad724cfd54b
-  data.tar.gz: 39f3e468d9b05c2ea9712997814a0867b280aa8b64e405937a8c250f7e776073c3544aac81abfd04a56b8fb2e89351cfbc52072bc60be963014a4246aad9d3d1
+  metadata.gz: 3df0bd92070c470e9e7100c0fb16975c4f08aa936b2d52b1411a5f9c070397bbf4a4f070a5ad7f8808a015f631733f28f827a0ad698ceb29e883d160cf008bee
+  data.tar.gz: ce24ce1a1499f5d4899aeda240cd1769e21a19e53f92882fd60a903eb659d0ec9d88aed412536ac87303aed45833d88fe94033df5561ae9613eecced11038645

data/app/controllers/motor/active_storage_attachments_controller.rb

@@ -9,29 +9,30 @@ module Motor
     load_and_authorize_resource :attachment, class: 'ActiveStorage::Attachment', parent: false
 
     def create
-      if attachable?(record)
-        record.public_send(@attachment.name).attach(file_params)
+      @attachment.assign_attributes(blob: ActiveStorage::Blob.create_and_upload!(file_params), record: record)
+      @attachment.assign_attributes(record_type: '', record_id: 0) unless record
 
-        head :ok
+      if @attachment.save(validate: false)
+        render json: { data: Motor::ApiQuery::BuildJson.call(@attachment, params, current_ability) }
       else
-        head :unprocessable_entity
+        render json: { errors: @attachment.errors }, status: :unprocessable_entity
       end
     end
 
     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=")
+      @record ||=
+        if @attachment.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])
+        else
+          current_user
+        end
     end
 
     def file_params

data/app/controllers/motor/data_controller.rb

@@ -31,7 +31,7 @@ module Motor
 
           @resource = @associated_resource
         else
-          @resource.public_send(params[:association].to_sym).create!(@associated_resource.attributes) do |resource|
+          @resource.public_send(params[:association].to_sym).create!(resource_params) do |resource|
             @resource = resource
           end
         end

data/config/locales/el.yml

@@ -302,6 +302,10 @@ el:
     on_collection: Κατά τη συλλογή
     association: Σύνδεση
     action_has_been_removed: Η ενέργεια αυτή έχει καταργηθεί
+    html: HTML
+    edit_html: Edit HTML
+    there_are_unsaved_changes_close_form: "There are unsaved changes. Close form?"
+    send_file_url: Send file URL
     i:
       locale: el
       select:

data/config/locales/en.yml

@@ -307,3 +307,7 @@ en:
     every_minute: Every minute
     every_5_minutes: Every 5 minutes
     do_not_refresh: Do not refresh
+    html: HTML
+    edit_html: Edit HTML
+    there_are_unsaved_changes_close_form: "There are unsaved changes. Close form?"
+    send_file_url: Send file URL

data/config/locales/es.yml

@@ -302,6 +302,10 @@ es:
     on_collection: En la colección
     association: Asociación
     action_has_been_removed: Esta acción ha sido eliminada
+    html: HTML
+    edit_html: Edit HTML
+    there_are_unsaved_changes_close_form: "There are unsaved changes. Close form?"
+    send_file_url: Send file URL
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -298,6 +298,10 @@ pt:
     on_collection: Na coleção
     association: Associação
     action_has_been_removed: Esta ação foi removida
+    html: HTML
+    edit_html: Edit HTML
+    there_are_unsaved_changes_close_form: "There are unsaved changes. Close form?"
+    send_file_url: Send file URL
     i:
       locale: pt
       select:

data/lib/motor/build_schema/load_from_rails.rb

@@ -137,6 +137,7 @@ module Motor
           validators: fetch_validators(model, column.name),
           reference: nil,
           format: fetch_format_hash(column, model),
+          description: '',
           virtual: false
         }
       end

data/lib/motor/build_schema.rb

@@ -65,7 +65,8 @@ module Motor
       default_value: nil,
       reference: nil,
       format: {},
-      validators: []
+      validators: [],
+      description: ''
     }.with_indifferent_access
 
     ACTION_DEFAULTS = {

data/lib/motor/resources.rb

@@ -5,7 +5,7 @@ module Motor
     RESOURCE_ATTRS = %w[display_name display_column icon custom_sql visible display_primary_key
                         searchable_columns].freeze
     COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format
-                      validators].freeze
+                      validators description].freeze
     ASSOCIATION_ATTRS = %w[name display_name model_name icon visible foreign_key primary_key options virtual
                            polymorphic slug].freeze
     SCOPE_ATTRS = %w[name display_name scope_type preferences visible].freeze

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.66'
+  VERSION = '0.2.69'
 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-1ebc4feb7f2b4c056ad8.css.gz": "main-1ebc4feb7f2b4c056ad8.css.gz",
-  "main-1ebc4feb7f2b4c056ad8.js.LICENSE.txt": "main-1ebc4feb7f2b4c056ad8.js.LICENSE.txt",
-  "main-1ebc4feb7f2b4c056ad8.js.gz": "main-1ebc4feb7f2b4c056ad8.js.gz",
-  "main.css": "main-1ebc4feb7f2b4c056ad8.css",
-  "main.js": "main-1ebc4feb7f2b4c056ad8.js"
+  "main-193823ff82e028dd5887.css.gz": "main-193823ff82e028dd5887.css.gz",
+  "main-193823ff82e028dd5887.js.LICENSE.txt": "main-193823ff82e028dd5887.js.LICENSE.txt",
+  "main-193823ff82e028dd5887.js.gz": "main-193823ff82e028dd5887.js.gz",
+  "main.css": "main-193823ff82e028dd5887.css",
+  "main.js": "main-193823ff82e028dd5887.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.66
+  version: 0.2.69
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-16 00:00:00.000000000 Z
+date: 2022-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -1534,8 +1534,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-1ebc4feb7f2b4c056ad8.css.gz
-- ui/dist/main-1ebc4feb7f2b4c056ad8.js.gz
+- ui/dist/main-193823ff82e028dd5887.css.gz
+- ui/dist/main-193823ff82e028dd5887.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses:
@@ -1558,7 +1558,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Low-code Admin panel and Business intelligence