madmin 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 502a8cbe4b6c86b1fa6f45d2f4d0f1f5b7852b48805a8d980cfb177ed4151c51
-  data.tar.gz: 41d8fbfd222f0758f81e2b90762d54ddbefd279ebd18b455ac2def6bd2a60e1e
+  metadata.gz: f115a8b369e2c84e6eda3dd65cd7734f9fc3ba4ec6c49679552202af4b651d66
+  data.tar.gz: 18b426fbe6ae3f17945d57b9bf6be94d7e063ea4f6fb71669443cce95ec38b02
 SHA512:
-  metadata.gz: c390c0a27fcfe25bee8b1ab32f7d53644cc68cad9ee386f17adf810839a511212dfa7fe821cf275edd63a95d1dccbdbeffb22bad56f1ffa5db6c0e67e56d3a74
-  data.tar.gz: be7ec1e7fa71db380147c44f154e539e56719b35be488f7068473dfccfeeba44175abb58ee281bf4eb1089ab8a188eb5b66c0e5d46d847f639f1bbe15895107d
+  metadata.gz: a044fdc4cd021c9bb2d68586a07f2fbb446ac8722ffba771278a8778171b99172cafa97ccc05871cfbef7a95cc3b779ea4a78bb823b90aafc56fbabd52a217a3
+  data.tar.gz: 6b287859f38758d12edb7a4dcc50161b1f7147c233fc8ffc3aed30cfc9c6dd9d71c55d82edf258096210c6001b5b476a9e0350cdbe32b23233a79162ba668383

data/README.md

@@ -229,6 +229,19 @@ end
 
 A nested has one shows its fields when the record exists, or an "Add" link when it doesn't, so saving the parent doesn't create an empty record.
 
+### Direct Uploads
+
+File fields upload through the form by default. Add `direct_upload: true` to upload straight from the browser to your Active Storage service instead, which keeps large files off your app servers and avoids request timeouts:
+
+```ruby
+class PostResource < Madmin::Resource
+  attribute :image, direct_upload: true
+  attribute :attachments, direct_upload: true
+end
+```
+
+Cloud services like S3 need CORS configured to accept uploads from the browser. See the [Active Storage guide](https://guides.rubyonrails.org/active_storage_overview.html#cross-origin-resource-sharing-cors-configuration).
+
 ## Custom Fields
 
 You can generate a custom field with:

data/app/controllers/madmin/resource_controller.rb

@@ -47,12 +47,25 @@ module Madmin
     end
 
     def destroy
-      @record.destroy
-      redirect_to resource.index_path
+      if @record.destroy
+        redirect_to resource.index_path, status: :see_other
+      else
+        destroy_failed destroy_errors
+      end
+    rescue ActiveRecord::DeleteRestrictionError, ActiveRecord::InvalidForeignKey
+      destroy_failed t("madmin.flash.destroy_restricted", name: resource.friendly_name)
     end
 
     private
 
+    def destroy_failed(message)
+      redirect_back_or_to resource.index_path, alert: message, status: :see_other
+    end
+
+    def destroy_errors
+      @record.errors.full_messages.to_sentence.presence || t("madmin.flash.destroy_failed", name: resource.friendly_name)
+    end
+
     def set_record
       @record = resource.model_find(params[:id])
     end

data/app/javascript/madmin/application.js

@@ -1,3 +1,7 @@
 import "@hotwired/turbo-rails"
 import "@rails/actiontext"
+import * as ActiveStorage from "@rails/activestorage"
 import "controllers"
+
+// Uploads files straight to storage for fields with `direct_upload: true`. Other file fields submit with the form
+ActiveStorage.start()

data/app/javascript/madmin/controllers/application.js

@@ -7,6 +7,3 @@ application.debug = false
 window.Stimulus   = application
 
 export { application }
-
-import { Dropdown } from "tailwindcss-stimulus-components"
-application.register("dropdown", Dropdown)

data/app/views/madmin/fields/attachment/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form.file_field field.to_param, class: "form-input"%>
+<%= form.file_field field.to_param, direct_upload: field.options.direct_upload, class: "form-input" %>
 
 <% if form.object.persisted? %>
   <div class="mt-2">

data/app/views/madmin/fields/attachments/_form.html.erb

@@ -1 +1 @@
-<%= form.file_field field.attribute_name, multiple: true, class: "form-input" %>
+<%= form.file_field field.attribute_name, multiple: true, direct_upload: field.options.direct_upload, class: "form-input" %>

data/app/views/madmin/fields/file/_form.html.erb

@@ -1 +1 @@
-<%= form.file_field field.attribute_name, class: "form-input" %>
+<%= form.file_field field.attribute_name, direct_upload: field.options.direct_upload, class: "form-input" %>

data/config/importmap.rb

@@ -10,5 +10,3 @@ pin "lexxy", to: "lexxy.js" if defined?(::Lexxy)
 
 pin_all_from Madmin::Engine.root.join("app/javascript/madmin/controllers"), under: "controllers", to: "madmin/controllers"
 pin_all_from Rails.root.join("app/javascript/madmin/controllers"), under: "controllers", to: "madmin/controllers"
-
-pin "tailwindcss-stimulus-components", to: "https://ga.jspm.io/npm:tailwindcss-stimulus-components@6.1.2/dist/tailwindcss-stimulus-components.module.js"

data/config/locales/el.yml

@@ -28,6 +28,8 @@ el:
         other: Υπήρξαν %{count} σφάλματα με την υποβολή σας
     flash:
       readonly: "%{name}: μόνο για ανάγνωση"
+      destroy_failed: "%{name}: η διαγραφή απέτυχε"
+      destroy_restricted: "%{name}: η διαγραφή απέτυχε επειδή άλλες εγγραφές εξαρτώνται από αυτήν"
     confirmations:
       delete: Είστε σίγουροι;
       remove_with_changes: Είστε σίγουροι; Θα χάσετε όλες τις άλλες αλλαγές.

data/config/locales/en.yml

@@ -28,6 +28,8 @@ en:
         other: There were %{count} errors with your submission
     flash:
       readonly: "%{name} is read-only"
+      destroy_failed: "%{name} could not be deleted"
+      destroy_restricted: "%{name} could not be deleted because other records depend on it"
     confirmations:
       delete: Are you sure?
       remove_with_changes: Are you sure? You will lose any other changes.

data/config/locales/fr.yml

@@ -28,6 +28,8 @@ fr:
         other: Il y a eu %{count} erreurs dans votre soumission
     flash:
       readonly: "%{name} est en lecture seule"
+      destroy_failed: "%{name} n'a pas pu être supprimé"
+      destroy_restricted: "%{name} n'a pas pu être supprimé car d'autres enregistrements en dépendent"
     confirmations:
       delete: Êtes-vous sûr ?
       remove_with_changes: Êtes-vous sûr ? Vous perdrez toutes les autres modifications.

data/config/locales/ko.yml

@@ -26,6 +26,9 @@ ko:
       errors:
         one: 제출한 내용에 오류가 1개 있습니다
         other: 제출한 내용에 오류가 %{count}개 있습니다
+    flash:
+      destroy_failed: "%{name}을(를) 삭제할 수 없습니다"
+      destroy_restricted: "다른 레코드가 참조하고 있어 %{name}을(를) 삭제할 수 없습니다"
     confirmations:
       delete: 정말 삭제하시겠습니까?
       remove_with_changes: 정말 제거하시겠습니까? 다른 변경 사항도 함께 사라집니다.

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "3.0.0"
+  VERSION = "3.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Chris Oliver