Only remove attachment upload button after trix has initialized (#3464)

* Only remove attachment upload button after trix has initialized I'm finding that when attachments are disabled the trix field controller is trying to remove the attachments button before trix has created the toolbar. This crashes the controller inside the connect method and so none of the other event listeners are set up. * Update app/javascript/js/controllers/fields/trix_field_controller.js * fix syntax * fix disable_attachments logic --------- Co-authored-by: Paul Bob <[email protected]> Co-authored-by: Paul Bob <[email protected]>
avo-hq · Dec 2, 2024 · f7c53f7 · f7c53f7
1 parent 85d957f
commit f7c53f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app/javascript/js/controllers/fields/trix_field_controller.js b/app/javascript/js/controllers/fields/trix_field_controller.js
@@ -38,7 +38,11 @@ export default class extends Controller {
   connect() {
     if (this.attachmentsDisabledValue) {
       // Remove the attachments button
-      this.controllerTarget.querySelector('.trix-button-group--file-tools').remove()
+      window.addEventListener('trix-initialize', (event) => {
+        if (event.target === this.editorTarget) {
+          this.controllerTarget.querySelector('.trix-button-group--file-tools').remove()
+        }
+      })
     }
 
     window.addEventListener('trix-file-accept', (event) => {

diff --git a/lib/avo/fields/trix_field.rb b/lib/avo/fields/trix_field.rb
@@ -31,11 +31,11 @@ def is_action_text?
       private
 
       def disable_attachments?(args)
-        # If we don't have an attachment_key, we disable attachments. There's no point in having
-        # attachments if we can't store them.
-        return false if args[:attachment_key].present?
+        # Return the value of attachments_disabled if explicitly provided
+        return args[:attachments_disabled] unless args[:attachments_disabled].nil?
 
-        args[:attachments_disabled] == true
+        # Disable attachments if attachment_key is not present
+        args[:attachment_key].blank?
       end
     end
   end