avo 2.21.0 → 2.21.1.pre.issue1444

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 302280e8ea8c09012d0f68c72b017a8e903261346e02fdb8b4eaf2daa3160d39
-  data.tar.gz: eef2ab4ee6fd1576311d85ef6ae91add6f655f9762e3cc736f39bbb2f039c31e
+  metadata.gz: 24cf9486da47ba10e6a5daa1580d555a14c87f9c642a5a8d56d69a9f47784f4e
+  data.tar.gz: e85a3b0a6bc76ba138b523601a64a74539559d919a4c984dc18a7361304527e1
 SHA512:
-  metadata.gz: bdf810fecb08f2a6d8a157238b28df1141b396b1a62387a88bb6094d0ac4c39195d36c319751eb7dca1368ed6f5174a241a23279bf558ade568091ce201d65ae
-  data.tar.gz: 983acf054fc7a5c8fd4f1f32b9f1a6c45e187d9c87f70a223203e8445f3d0ecd1d05eb80ac0fc02ec497604636a37a20d8ab8365a21477dbd9decc60ad1760f5
+  metadata.gz: 34db8a5f063bef99fd6a4cdb5cc72df589e1f0329286ec7f22653de5c96a47788a7c9ad82a7197b11acb90355f9c8f5fd4ba594bf29dace1613d74d31a520917
+  data.tar.gz: 05b2170b8af382365f157c31335b1f913f44a7d5117fe22a1cf6130200362b788812315604e7836570e384a1f2708d58625503aad2fcbbad3a738cb2163ba0f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.21.0)
+    avo (2.21.1.pre.issue1444)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -409,7 +409,7 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
-    view_component (2.78.0)
+    view_component (2.77.0)
       activesupport (>= 5.0.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

data/app/components/avo/empty_state_component.html.erb

@@ -4,7 +4,7 @@
 <div class="relative flex-1 flex flex-col items-center justify-center space-y-12 py-24">
   <%= helpers.svg view_type_svg, class: 'h-[250px]' %>
   <div class="text-gray-500 text-center">
-    <%= text %>
+    <%= message %>
   </div>
 </div>
 <% if @add_background %>

data/app/components/avo/empty_state_component.rb

@@ -1,26 +1,24 @@
 # frozen_string_literal: true
 
 class Avo::EmptyStateComponent < ViewComponent::Base
-  attr_reader :message, :view_type, :add_background, :by_association
-
-  def initialize(message: nil, view_type: :table, add_background: false, by_association: false)
+  def initialize(message: nil, resource_name: nil, related_name: nil, view_type: :table, add_background: false)
     @message = message
     @view_type = view_type
+    @related_name = related_name
+    @resource_name = resource_name
     @add_background = add_background
-    @by_association = by_association
   end
 
-  def text
-    message || locale_message
-  end
+  def message
+    return @message if @message.present?
 
-  def view_type_svg
-    "#{view_type}-empty-state"
+    translation_tag = @related_name.present? ? 'avo.no_related_item_found' : 'avo.no_item_found'
+    helpers.t translation_tag, item: @resource_name
   end
 
-  private
+  def view_type_svg
+    return "grid-empty-state" if @view_type.to_sym == :grid
 
-  def locale_message
-    helpers.t by_association ? 'avo.no_related_item_found' : 'avo.no_item_found'
+    "table-empty-state"
   end
 end

data/app/components/avo/fields/belongs_to_field/edit_component.rb

@@ -8,7 +8,7 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
   end
 
   def disabled
-    return true if @field.is_readonly? || @field.is_disabled?
+    return true if @field.is_readonly?
 
     # When visiting the record through it's association we keep the field disabled by default
     # We make an exception when the user deliberately instructs Avo to allow detaching in this scenario

data/app/components/avo/fields/boolean_field/edit_component.html.erb

@@ -4,7 +4,7 @@
       checked: @field.value,
       class: "text-lg h-4 w-4 checked:bg-primary-400 focus:checked:!bg-primary-400 #{@field.get_html(:classes, view: view, element: :input)}",
       data: @field.get_html(:data, view: view, element: :input),
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       style: @field.get_html(:style, view: view, element: :input)
     %>
   </div>

data/app/components/avo/fields/boolean_group_field/edit_component.html.erb

@@ -20,7 +20,7 @@
           <%= check_box_tag "#{model_param_key}[#{@field.id}][]", id, checked, {
               class: "w-4 h-4 #{@field.get_html(:classes, view: view, element: :input)}",
               data: @field.get_html(:data, view: view, element: :input),
-              disabled: disabled?,
+              disabled: @field.is_readonly?,
               id: "#{model_param_key}_#{@field.id}_#{id}",
               style: @field.get_html(:style, view: view, element: :input)
             } %> <%= label %>

data/app/components/avo/fields/code_field/edit_component.html.erb

@@ -8,12 +8,12 @@
         language: @field.language,
         theme: @field.theme,
         'tab-size': @field.tab_size,
-        'read-only': disabled?,
+        'read-only': @field.is_readonly?,
         'indent-with-tabs': @field.indent_with_tabs,
         'line-wrapping': @field.line_wrapping,
         **@field.get_html(:data, view: view, element: :input),
       },
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>

data/app/components/avo/fields/country_field/edit_component.html.erb

@@ -8,7 +8,7 @@
     },
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: disabled?,
+    disabled: @field.is_readonly?,
     style: @field.get_html(:style, view: view, element: :input),
     placeholder: @field.include_blank.present? ? nil : @field.placeholder
   %>

data/app/components/avo/fields/date_field/edit_component.html.erb

@@ -18,7 +18,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>
@@ -30,7 +30,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>

data/app/components/avo/fields/date_time_field/edit_component.html.erb

@@ -20,7 +20,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>
@@ -32,7 +32,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>

data/app/components/avo/fields/edit_component.rb

@@ -42,8 +42,4 @@ class Avo::Fields::EditComponent < ViewComponent::Base
       view: view
     }
   end
-
-  def disabled?
-    field.is_readonly? || field.is_disabled?
-  end
 end

data/app/components/avo/fields/external_image_field/edit_component.html.erb

@@ -2,7 +2,7 @@
   <%= @form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: disabled?,
+    disabled: @field.is_readonly?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input)
   %>

data/app/components/avo/fields/file_field/edit_component.html.erb

@@ -10,7 +10,7 @@
       accept: @field.accept,
       data: @field.get_html(:data, view: view, element: :input),
       direct_upload: @field.direct_upload,
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       style: @field.get_html(:style, view: view, element: :input),
       class: "w-full"
     %>

data/app/components/avo/fields/files_field/edit_component.html.erb

@@ -7,7 +7,7 @@
         accept: @field.accept,
         data: @field.get_html(:data, view: view, element: :input),
         direct_upload: @field.direct_upload,
-        disabled: disabled?,
+        disabled: @field.is_readonly?,
         multiple: true,
         style: @field.get_html(:style, view: view, element: :input),
         class: "w-full"

data/app/components/avo/fields/has_one_field/show_component.html.erb

@@ -5,7 +5,7 @@
 <% else %>
   <%= render Avo::PanelComponent.new(name: @field.name) do |c| %>
     <% c.tools do %>
-      <% if !@field.is_readonly? && !@field.is_disabled? && can_attach? %>
+      <% if !@field.is_readonly? && can_attach? %>
         <%= a_link attach_path,
           icon: 'heroicons/outline/link',
           color: :primary,
@@ -13,7 +13,7 @@
           <%= t('avo.attach_item', item: @field.name.downcase) %>
         <% end %>
       <% end %>
-      <% if !@field.is_readonly? && !@field.is_disabled? && can_see_the_create_button? %>
+      <% if !@field.is_readonly? && can_see_the_create_button? %>
         <%= a_link create_path,
           icon: 'heroicons/outline/plus',
           'data-target': 'create',
@@ -27,7 +27,7 @@
 
     <% c.body do %>
       <div class="py-8 flex justify-center items-center">
-        <%= empty_state by_association: params[:related_name].present? %>
+        <%= empty_state resource_name: @field.id, related_name: params[:related_name] %>
       </div>
     <% end %>
   <% end %>

data/app/components/avo/fields/markdown_field/edit_component.html.erb

@@ -7,7 +7,7 @@
         'simple-mde-target': 'element',
         'component-options': @field.options.to_json,
       },
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>

data/app/components/avo/fields/markdown_field/show_component.html.erb

@@ -3,7 +3,7 @@
     <%= text_area_tag @field.id, @field.value,
       class: helpers.input_classes('w-full js-has-simple-mde-editor'),
       placeholder: @field.placeholder,
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       'data-simple-mde-target': 'element',
       'data-component-options': @field.options.to_json,
       'data-view': :show %>

data/app/components/avo/fields/number_field/edit_component.html.erb

@@ -2,7 +2,7 @@
   <%= @form.number_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: disabled?,
+    disabled: @field.is_readonly?,
     max: @field.max,
     min: @field.min,
     placeholder: @field.placeholder,

data/app/components/avo/fields/password_field/edit_component.html.erb

@@ -2,7 +2,7 @@
   <%= @form.password_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: disabled?,
+    disabled: @field.is_readonly?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input)
     %>

data/app/components/avo/fields/progress_bar_field/edit_component.html.erb

@@ -7,7 +7,7 @@
   <%= @form.range_field @field.id,
     class: "w-full #{@field.get_html(:classes, view: view, element: :input)}",
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: disabled?,
+    disabled: @field.is_readonly?,
     max: @field.max,
     min: 0,
     placeholder: @field.placeholder,

data/app/components/avo/fields/select_field/edit_component.html.erb

@@ -7,7 +7,7 @@
     },
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: disabled?,
+    disabled: @field.is_readonly?,
     style: @field.get_html(:style, view: view, element: :input),
     value: @field.model.present? ? @field.model[@field.id] : @field.value,
     placeholder: @field.include_blank.present? ? nil : @field.placeholder

data/app/components/avo/fields/show_component.rb

@@ -52,8 +52,4 @@ class Avo::Fields::ShowComponent < ViewComponent::Base
       view: view
     }
   end
-
-  def disabled?
-    field.is_readonly? || field.is_disabled?
-  end
 end

data/app/components/avo/fields/status_field/edit_component.html.erb

@@ -2,7 +2,7 @@
   <%= @form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: disabled?,
+    disabled: @field.is_readonly?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
     value: @resource.model.present? ? @resource.model[@field.id] : @field.value

data/app/components/avo/fields/tags_field/edit_component.html.erb

@@ -6,7 +6,7 @@
       data: {
         'tags-field-target': 'fakeInput',
       },
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input),
       value: ''
@@ -22,7 +22,7 @@
         'delimiters': @field.delimiters,
         'close-on-select': @field.close_on_select ? 1 : 0,
       },
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input),
       value: @field.field_value.to_json

data/app/components/avo/fields/text_field/edit_component.html.erb

@@ -2,7 +2,7 @@
   <%= form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: disabled?,
+    disabled: @field.is_readonly?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
     # value: @field.value,

data/app/components/avo/fields/textarea_field/edit_component.html.erb

@@ -2,7 +2,7 @@
   <%= @form.text_area @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: disabled?,
+    disabled: @field.is_readonly?,
     placeholder: @field.placeholder,
     rows: @field.rows,
     style: @field.get_html(:style, view: view, element: :input)

data/app/components/avo/fields/time_field/edit_component.html.erb

@@ -20,7 +20,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>
@@ -32,7 +32,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>

data/app/components/avo/fields/trix_field/edit_component.html.erb

@@ -1,6 +1,5 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <%= content_tag :div,
-    class: "relative block overflow-x-auto max-w-full",
+  <%= content_tag :div, class: "relative block overflow-x-auto max-w-full",
     data: {
       controller: "trix-field",
       trix_field_target: "controller",
@@ -25,7 +24,7 @@
     <%= @form.text_area @field.id,
       class: classes("w-full hidden"),
       data: @field.get_html(:data, view: view, element: :input),
-      disabled: disabled?,
+      disabled: @field.is_readonly?,
       id: trix_id,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)

data/app/components/avo/fields/trix_field/edit_component.rb

@@ -20,10 +20,6 @@ class Avo::Fields::TrixField::EditComponent < Avo::Fields::EditComponent
   end
 
   def trix_id
-    if resource_name.present?
-      "trix_#{resource_name}_#{@field.id}"
-    elsif form.present?
-      "trix_#{form.index}_#{@field.id}"
-    end
+    "trix_#{resource_name}_#{@field.id}"
   end
 end

data/app/components/avo/index/resource_grid_component.html.erb

@@ -9,6 +9,6 @@
   </div>
 <% else %>
   <div class="bg-white rounded shadow-panel">
-    <%= helpers.empty_state by_association: params[:related_name].present?, view_type: :grid %>
+    <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: :grid %>
   </div>
 <% end %>

data/app/components/avo/index/resource_table_component.rb

@@ -2,7 +2,7 @@
 
 class Avo::Index::ResourceTableComponent < ViewComponent::Base
   include Avo::ApplicationHelper
-  attr_reader :pagy, :query
+  attr_reader :pagy
 
   def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil, parent_resource: nil, pagy: nil, query: nil)
     @resources = resources
@@ -15,10 +15,10 @@ class Avo::Index::ResourceTableComponent < ViewComponent::Base
   end
 
   def encrypted_query
-    return :select_all_disabled if query.nil? || !query.respond_to?(:all) || !query.all.respond_to?(:to_sql)
+    return if @query.nil?
 
     Avo::Services::EncryptionService.encrypt(
-      message: query.all.to_sql,
+      message: @query.all.to_sql,
       purpose: :select_all
     )
   end

data/app/components/avo/paginator_component.html.erb

@@ -25,7 +25,11 @@
               %> <%= t('avo.per_page').downcase %>
             </div>
             <% per_page_options.each do |option| %>
-              <%= link_to "Change to #{option} items per page", change_items_per_page_url(option), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+              <% if parent_model.present? %>
+                <%= link_to "Change to #{option} items per page", helpers.related_resources_path(parent_model, parent_model, per_page: option, keep_query_params: true, page: 1), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+              <% else %>
+                <%= link_to "Change to #{option} items per page", helpers.resources_path(resource: resource, per_page: option, keep_query_params: true, page: 1), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+              <% end %>
             <% end %>
           </div>
         </div>

data/app/components/avo/paginator_component.rb

@@ -16,12 +16,4 @@ class Avo::PaginatorComponent < ViewComponent::Base
     @parent_model = parent_model
     @discreet_pagination = discreet_pagination
   end
-
-  def change_items_per_page_url(option)
-    if parent_model.present?
-      helpers.related_resources_path(parent_model, parent_model, per_page: option, keep_query_params: true, page: 1)
-    else
-      helpers.resources_path(resource: resource, per_page: option, keep_query_params: true, page: 1)
-    end
-  end
 end

data/app/components/avo/resource_component.rb

@@ -53,7 +53,6 @@ class Avo::ResourceComponent < Avo::BaseComponent
     end
   end
 
-  # Ex: A Post has many Comments
   def authorize_association_for(policy_method)
     policy_result = true
 
@@ -68,25 +67,11 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
       if association_name.present?
         method_name = "#{policy_method}_#{association_name}?".to_sym
-
-        # Use the policy methods from the parent (Post)
+        # Prepare the authorization service
         service = reflection_resource.authorization
 
         if service.has_method?(method_name, raise_exception: false)
-          # Some policy methods should get the parent record in order to have the necessarry information to do the authorization
-          # Example: Post->has_many->Comments
-          # When you want to authorize the creation/attaching of a Comment, you don't have the Comment instance.
-          # But you do have the Post instance and you can get that in your policy to authorize against.
-          parent_policy_methods = [:view, :create, :attach, :act_on]
-
-          record = if parent_policy_methods.include?(policy_method)
-            # Use the parent record (Post)
-            reflection_resource.model
-          else
-            # Override the record with the child record (Comment)
-            resource.model
-          end
-          policy_result = service.authorize_action(method_name, record: record, raise_exception: false)
+          policy_result = service.authorize_action(method_name, raise_exception: false)
         end
       end
     end

data/app/components/avo/views/resource_index_component.html.erb

@@ -52,7 +52,7 @@
             <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
           </div>
         <% else %>
-          <%= helpers.empty_state by_association: params[:related_name].present?, view_type: view_type, add_background: true %>
+          <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: view_type, add_background: true %>
         <% end %>
       <% end %>
     <% end %>

data/app/controllers/avo/attachments_controller.rb

@@ -10,10 +10,6 @@ module Avo
       blob = ActiveStorage::Blob.create_and_upload! io: params[:file], filename: params[:filename]
       association_name = BaseResource.valid_attachment_name(@model, params[:attachment_key])
 
-      if association_name.blank?
-        raise ActionController::BadRequest.new("Could not find the attachment association for #{params[:attachment_key]} (check the `attachment_key` for this Trix field)")
-      end
-
       @model.send(association_name).attach blob
 
       render json: {

data/app/controllers/avo/base_controller.rb

@@ -14,7 +14,6 @@ module Avo
     before_action :fill_model, only: [:create, :update]
     # Don't run base authorizations for associations
     before_action :authorize_base_action, if: -> { controller_name != "associations" }
-    before_action :set_pagy_locale, only: :index
 
     def index
       @page_title = @resource.plural_name.humanize
@@ -224,11 +223,11 @@ module Avo
         # In case there's an error somewhere else than the model
         # Example: When you save a license that should create a user for it and creating that user throws and error.
         # Example: When you Try to delete a record and has a foreign key constraint.
-        exception_message = exception.message
+        @errors = Array.wrap(exception.message)
       end
 
       # Add the errors from the model
-      @errors = @model.errors.full_messages.reject { |error| exception_message.include? error }.unshift exception_message
+      @errors = Array.wrap([@errors, @model.errors.full_messages]).compact
 
       succeeded
     end
@@ -511,10 +510,5 @@ module Avo
     def is_associated_record?
       params[:via_relation_class].present? && params[:via_resource_id].present?
     end
-
-    # Set pagy locale from params or from avo configuration, if both nil locale = "en"
-    def set_pagy_locale
-      @pagy_locale = locale.to_s || Avo.configuration.locale || "en"
-    end
   end
 end

data/app/controllers/avo/dashboards/cards_controller.rb

@@ -21,7 +21,7 @@ module Avo
 
       def set_card
         @card = @dashboard.item_at_index(params[:index].to_i).tap do |card|
-          card.hydrate(dashboard: @dashboard)
+          card.hydrate(dashboard: @dashboard, params: params)
         end
       end
 

data/app/controllers/avo/search_controller.rb

@@ -44,33 +44,27 @@ module Avo
     end
 
     def search_resource(resource)
-      query = Avo::Hosts::SearchScopeHost.new(
+      query =  Avo::Hosts::SearchScopeHost.new(
         block: resource.search_query,
         params: params,
-        scope: resource.class.scope
+        scope: resource.class.scope.limit(8)
       ).handle
 
-      # Get the count
-      results_count = query.count
-
-      # Get the results
-      query = query.limit(8)
-
       query = apply_scope(query) if should_apply_any_scope?
 
       results = apply_search_metadata(query, resource)
 
       header = resource.plural_name
 
-      if results_count > 0
-        header = "#{header} (#{results_count})"
+      if results.length > 0
+        header += " (#{results.length})"
       end
 
       result_object = {
         header: header,
         help: resource.class.search_query_help,
         results: results,
-        count: results_count
+        count: results.length
       }
 
       [resource.name.pluralize.downcase, result_object]

data/app/javascript/js/controllers/fields/trix_field_controller.js

@@ -55,7 +55,7 @@ export default class extends Controller {
         }
 
         // Prevent file uploads for resources that haven't been saved yet.
-        if (!this.resourceId) {
+        if (this.resourceId === '') {
           event.preventDefault()
           alert("You can't upload files into the Trix editor until you save the resource.")
 
@@ -63,7 +63,7 @@ export default class extends Controller {
         }
 
         // Prevent file uploads for fields without an attachment key.
-        if (!this.attachmentKey) {
+        if (this.attachmentKey === '') {
           event.preventDefault()
           alert("You haven't set an `attachment_key` to this Trix field.")
         }
@@ -93,10 +93,7 @@ export default class extends Controller {
 
     xhr.open('POST', this.uploadUrl, true)
 
-    const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content
-    if (csrfToken) {
-      xhr.setRequestHeader('X-CSRF-Token', csrfToken)
-    }
+    xhr.setRequestHeader('X-CSRF-Token', document.querySelector('meta[name="csrf-token"]').content)
 
     xhr.upload.addEventListener('progress', (event) => {
       // eslint-disable-next-line no-mixed-operators