avo 3.0.0.beta1 → 3.0.0.pre1

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

@@ -36,15 +36,11 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   end
 
   def create_path
-    association_id = @field.resource.model_class._reflections[@field.id.to_s].inverse_of.name
-
     args = {
-      via_relation: association_id,
+      via_relation: @resource.singular_model_key,
       via_relation_class: @resource.model_class.to_s,
-      via_record_id: @resource.record.to_param,
-      via_association_type: :has_one
+      via_record_id: @resource.record.to_param
     }
-
     helpers.new_resource_path(resource: @field.target_resource, **args)
   end
 end

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

@@ -3,7 +3,6 @@
 class Avo::Fields::IndexComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
 
-  attr_reader :field
   attr_reader :parent_resource
   attr_reader :view
 

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

@@ -1,11 +1,10 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <div data-controller="easy-mde">
+  <div data-controller="simple-mde">
     <%= @form.text_area @field.id,
-      value: @field.value,
-      class: classes("w-full js-has-easy-mde-editor"),
+      class: classes("w-full js-has-simple-mde-editor"),
       data: {
         view: view,
-        'easy-mde-target': 'element',
+        'simple-mde-target': 'element',
         'component-options': @field.options.to_json,
       },
       disabled: disabled?,

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

@@ -1,10 +1,10 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <div data-controller="easy-mde">
+  <div data-controller="simple-mde">
     <%= text_area_tag @field.id, @field.value,
-      class: helpers.input_classes('w-full js-has-easy-mde-editor'),
+      class: helpers.input_classes('w-full js-has-simple-mde-editor'),
       placeholder: @field.placeholder,
       disabled: disabled?,
-      'data-easy-mde-target': 'element',
+      'data-simple-mde-target': 'element',
       'data-component-options': @field.options.to_json,
       'data-view': :show %>
   </div>

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

@@ -1,6 +1,5 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.number_field @field.id,
-    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,
@@ -8,7 +7,6 @@
     min: @field.min,
     placeholder: @field.placeholder,
     step: @field.step,
-    style: @field.get_html(:style, view: view, element: :input),
-    autocomplete: @field.autocomplete
+    style: @field.get_html(:style, view: view, element: :input)
   %>
 <% end %>

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

@@ -1,11 +1,9 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.password_field @field.id,
-    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,
     placeholder: @field.placeholder,
-    style: @field.get_html(:style, view: view, element: :input),
-    autocomplete: @field.autocomplete
+    style: @field.get_html(:style, view: view, element: :input)
     %>
 <% end %>

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

@@ -6,7 +6,6 @@
       </div>
     <% end %>
     <%= @form.range_field @field.id,
-      value: @field.value,
       class: "w-full #{@field.get_html(:classes, view: view, element: :input)}",
       data: {
         action: "input->progress-bar-field#update",

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

@@ -10,7 +10,6 @@
     disabled: disabled?,
     style: @field.get_html(:style, view: view, element: :input),
     value: @field.record.present? ? @field.record[@field.id] : @field.value,
-    placeholder: @field.include_blank.present? ? nil : @field.placeholder,
-    autocomplete: @field.autocomplete
+    placeholder: @field.include_blank.present? ? nil : @field.placeholder
   %>
 <% end %>

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

@@ -5,6 +5,6 @@
     disabled: disabled?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
-    value: @field.value
+    value: @resource.record.present? ? @resource.record[@field.id] : @field.value
   %>
 <% end %>

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

@@ -1,12 +1,11 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= form.text_field @field.id,
-    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
-    multiple: multiple,
-    autocomplete: @field.autocomplete
+    # value: @field.value,
+    multiple: multiple
   %>
 <% end %>

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

@@ -1,6 +1,5 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.text_area @field.id,
-    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,

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

@@ -20,10 +20,9 @@
       },
       input: trix_id,
       placeholder: @field.placeholder do %>
-      <%= sanitize @field.value.to_s %>
+      <%== @field.value %>
     <% end %>
     <%= @form.text_area @field.id,
-      value: @field.value,
       class: classes("w-full hidden"),
       data: @field.get_html(:data, view: view, element: :input),
       disabled: disabled?,

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

@@ -8,7 +8,7 @@
       <%= link_to t('avo.show_content'), 'javascript:void(0);', class: 'font-bold inline-block', data: { action: 'click->hidden-input#showContent' } %>
     <% end %>
     <div class="<%= content_classes %> " data-hidden-input-target="content">
-      <%= sanitize @field.value.to_s %>
+      <%== @field.value %>
     </div>
   </div>
 <% end %>

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

@@ -19,6 +19,6 @@
   <% end %>
   <% if params[:avo_debug].present? %>
     <!-- Raw value: -->
-    <!-- <%= sanitize @field.value.inspect %> -->
+    <!-- <%== @field.value.inspect %> -->
   <% end %>
 <% end %>

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

@@ -21,6 +21,7 @@ class Avo::Index::FieldWrapperComponent < ViewComponent::Base
       result += " py-3"
     end
 
+    result += " #{text_align_classes}"
     result += " #{@field.get_html(:classes, view: view, element: :wrapper)}"
 
     result
@@ -44,4 +45,15 @@ class Avo::Index::FieldWrapperComponent < ViewComponent::Base
 
     attributes
   end
+
+  private
+
+  def text_align_classes
+    case @field.index_text_align.to_sym
+    when :right
+      "text-right"
+    when :center
+      "text-center"
+    end
+  end
 end

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

@@ -5,19 +5,45 @@
   data-resource-name="<%= @resource.class.to_s %>"
   data-record-id="<%= @resource.record.id %>"
 >
-  <%= content_tag :div,
-    class: "relative w-full pb-3/4 rounded-t overflow-hidden #{html(:cover, :classes)}",
-    style: html(:cover, :style) do %>
-    <%== item_selector_input(floating: true, size: :lg) if @resource.record_selector%>
-    <%= render_cover %>
+  <%= content_tag :div, class: "relative w-full pb-3/4 rounded-t overflow-hidden #{cover.present? ? cover.get_html(:classes, view: :index, element: :wrapper) : ""}", style: cover.present? ? cover.get_html(:style, view: :index, element: :wrapper) : "" do %>
+    <% if @resource.record_selector %>
+      <%== item_selector_input floating: true, size: :lg %>
+    <% end %>
+    <% if cover.blank? %>
+      <%= link_to resource_view_path do %>
+        <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
+      <% end %>
+    <% elsif cover.respond_to?(:to_image) && cover.to_image.present? %>
+      <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), resource_view_path, class: 'absolute h-full w-full object-cover', title: title.value %>
+    <% elsif cover.type == 'file' %>
+      <% if cover.value.attached? && cover.value.representable? %>
+        <%= link_to_if cover.link_to_resource, image_tag(helpers.main_app.url_for(cover.value.variant(resize_to_limit: [480, 480])), class: 'absolute h-full w-full object-cover'), resource_view_path, class: 'absolute h-full w-full object-cover', title: title.value %>
+      <% else %>
+        <%= link_to resource_view_path do %>
+          <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
+        <% end %>
+      <% end %>
+    <% elsif cover.value.present? %>
+      <%= link_to_if cover.link_to_resource, image_tag(cover.value, class: 'absolute h-full w-full object-cover'), resource_view_path, class: 'absolute h-full w-full object-cover', title: title.value %>
+    <% else %>
+      <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
+    <% end %>
   <% end %>
-  <div class="grid grid-cols-1 place-content-between p-4 h-full">
+  <%= content_tag :div, class: "grid grid-cols-1 place-content-between p-4 h-full" do %>
     <div class="mb-4 h-full flex flex-col space-between">
-      <%= render_title %>
-      <%= render_body %>
+      <% if title.present? %>
+        <%= content_tag :div, class: "grid font-semibold leading-tight text-lg mb-2 #{title.get_html(:classes, view: :index, element: :wrapper)}", style: title.get_html(:style, view: :index, element: :wrapper) do %>
+          <%= link_to_if title.link_to_resource, title.value, resource_view_path %>
+        <% end %>
+      <% end %>
+      <% if body.present? %>
+        <%= content_tag :div, class: "text-sm break-words text-gray-500 #{body.get_html(:classes, view: :index, element: :wrapper)}", style: body.get_html(:style, view: :index, element: :wrapper) do %>
+          <%= body.value %>
+        <% end %>
+      <% end %>
     </div>
     <div class="w-full place-self-end">
       <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, view_type: :grid, actions: actions)) %>
     </div>
-  </div>
+  <% end %>
 </div>

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

@@ -2,26 +2,30 @@
 
 class Avo::Index::GridItemComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
-  include Avo::Fields::Concerns::HasHTMLAttributes
 
   attr_reader :parent_resource, :actions
 
   def initialize(resource: nil, reflection: nil, parent_record: nil, parent_resource: nil, actions: nil)
     @resource = resource
     @reflection = reflection
+    @grid_fields = resource.get_grid_fields
     @parent_record = parent_record
     @parent_resource = parent_resource
     @actions = actions
-    @card = Avo::ExecutionContext.new(target: resource.grid_view[:card], resource: resource, record: resource.record).handle
-    @whole_html = Avo::ExecutionContext.new(target: resource.grid_view[:html], resource: resource, record: resource.record).handle
   end
 
   private
 
-  def html(element, type)
-    return "" if @whole_html.nil? || (@html = @whole_html[element]).nil?
+  def cover
+    @grid_fields.cover_field
+  end
+
+  def title
+    @grid_fields.title_field
+  end
 
-    get_html(type, view: :index, element: :wrapper)
+  def body
+    @grid_fields.body_field
   end
 
   def resource_view_path
@@ -36,34 +40,4 @@ class Avo::Index::GridItemComponent < Avo::BaseComponent
 
     helpers.resource_view_path(record: @resource.record, resource: parent_or_child_resource, **args)
   end
-
-  def render_cover
-    return link_to_cover if @card[:cover_url].present?
-
-    link_to resource_view_path do
-      render Avo::Index::GridCoverEmptyStateComponent.new
-    end
-  end
-
-  def link_to_cover
-    classes = "absolute h-full w-full object-cover"
-
-    link_to image_tag(@card[:cover_url], class: classes), resource_view_path, class: classes, title: @card[:title]
-  end
-
-  def render_title
-    return if @card[:title].blank?
-
-    content_tag :div, class: "grid font-semibold leading-tight text-lg mb-2 #{html(:title, :classes)}", style: html(:title, :style) do
-      link_to @card[:title], resource_view_path
-    end
-  end
-
-  def render_body
-    return if @card[:body].blank?
-
-    content_tag :div, class: "text-sm break-words text-gray-500 #{html(:body, :classes)}", style: html(:body, :style) do
-      @card[:body]
-    end
-  end
 end

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

@@ -13,7 +13,10 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def can_detach?
-    is_has_many_association? ? super : false
+    @reflection.present? &&
+      @resource.record.present? &&
+      is_has_many_association &&
+      authorize_association_for(:detach)
   end
 
   def can_edit?
@@ -41,7 +44,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
       }
     end
 
-    helpers.resource_path(record: @resource.record, resource: parent_or_child_resource, **args)
+    helpers.resource_path(record: @resource.record, resource: parent_or_child_resource , **args)
   end
 
   def edit_path
@@ -70,19 +73,19 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     return @parent_resource if @parent_resource.present?
     return nil if @parent_record.blank?
 
-    Avo.resource_manager.get_resource_by_model_class @parent_record.class
+    ::Avo::App.resources.get_resource_by_model_class @parent_record.class
   end
 
-  def is_has_many_association?
+  def is_has_many_association
     @reflection.is_a?(::ActiveRecord::Reflection::HasManyReflection) || @reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection)
   end
 
   def referrer_path
-    Avo.root_path(paths: ["resources", params[:resource_name], params[:id], params[:related_name]], query: request.query_parameters.to_h)
+    Avo::App.root_path(paths: ["resources", params[:resource_name], params[:id], params[:related_name]], query: request.query_parameters.to_h)
   end
 
   def can_reorder?
-    return false unless Object.const_defined? "Avo::Pro::Ordering"
+    return false unless Object.const_defined? "AvoPro::Ordering"
 
     return authorize_association_for(:reorder) if @reflection.present?
 
@@ -164,13 +167,13 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
         target: "control:detach",
         control: :detach,
         "resource-id": @resource.record.id,
-        tippy: :tooltip,
+        "tippy": "tooltip",
       }
   end
 
   def render_order_controls(control)
     if can_reorder?
-      render Avo::Pro::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type
+      render AvoPro::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type
     end
   end
 

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

@@ -17,7 +17,7 @@ class Avo::Index::ResourceTableComponent < ViewComponent::Base
 
   def encrypted_query
     # TODO: move this to the resource where we can apply the adapter pattern
-    serialized_query = if Module.const_defined?("Ransack::Search") && query.instance_of?(Ransack::Search)
+    serialized_query = if query.instance_of?(Ransack::Search)
       query.context.object.to_sql
     else
       return :select_all_disabled if query.nil? || !query.respond_to?(:all) || !query.all.respond_to?(:to_sql)

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

@@ -4,10 +4,13 @@
   <% end %>
 <% elsif item.is_panel? %>
   <%= render Avo::PanelComponent.new(name: item.name, description: item.description, index: index) do |c| %>
-    <% c.with_body do %>
+    <% c.body do %>
       <div class="divide-y">
         <% item.visible_items.each_with_index do |field, index| %>
-          <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: field, index: index, view: @view, form: form %>
+          <%= render field
+            .hydrate(resource: @resource, record: @resource.record, user: resource.user, view: view)
+            .component_for_view(view)
+            .new(field: field, resource: @resource, index: index, form: form) %>
         <% end %>
       </div>
     <% end %>
@@ -16,12 +19,4 @@
   <%= render tab_group_component %>
 <% elsif item.is_field? %>
   <%= render field_component %>
-<% elsif item.is_row? %>
-  <%= render Avo::RowComponent.new do |c| %>
-    <% c.with_body do %>
-      <% item.visible_items.each_with_index do |field, index| %>
-        <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: field, index: index, view: @view, form: form %>
-      <% end %>
-    <% end %>
-  <% end %>
 <% end %>

data/app/components/avo/item_switcher_component.rb

@@ -42,7 +42,6 @@ class Avo::ItemSwitcherComponent < Avo::BaseComponent
   end
 
   def field_component
-    final_item = item.dup.hydrate(resource: @resource, record: @resource.record, user: resource.user, view: view)
-    final_item.component_for_view(@view).new(field: final_item, resource: @resource, index: index, form: form)
+    item.component_for_view(@view).new(field: item.hydrate(resource: @resource, view: @view, record: @resource.record), resource: @resource, index: index, form: form)
   end
 end

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

@@ -3,7 +3,7 @@
   data-modal-target="modal"
 >
   <div aria-expanded="true" class="modal-overlay absolute w-full h-full bg-opacity-25 bg-gray-800 flex justify-center items-center" data-action="click->modal#close"></div>
-  <div aria-expanded="true" role="dialog" aria-modal="true" class="modal-body rounded-lg inset-auto w-11/12 lg:w-1/2 sm:max-w-168 min-h-1/4 bg-white flex z-50 relative shadow-modal overflow-auto max-h-full">
+  <div aria-expanded="true" role="dialog" aria-modal="true" class="modal-body rounded-lg overflow-hidden inset-auto w-11/12 lg:w-1/2 sm:max-w-168 min-h-1/4 bg-white flex z-50 relative shadow-modal">
     <div class="flex-1 flex flex-col justify-between">
       <div>
         <div class="p-6 text-2xl tracking-normal font-semibold text-black">

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

@@ -25,7 +25,7 @@
   <% end %>
   <% if body? %>
     <div data-target="panel-body" class="flex flex-col sm:flex-row space-y-4 sm:space-y-0 sm:gap-4 w-full">
-      <div class="relative flex-1 w-full <% if sidebar? %> sm:w-2/3 <% end %>">
+      <div class="relative flex-1 <% if sidebar? %> w-2/3 <% else %> w-full <% end %>">
         <% # The body is wrapped inside another div in order to avoid long & tall panels next to sidebars when the sidebar taller. %>
         <div class="relative <%= white_panel_classes %> <%= @body_classes %>">
           <%= body %>
@@ -36,11 +36,6 @@
           <%= sidebar %>
         </div>
       <% end %>
-      <% if bare_sidebar? %>
-        <div class="w-full sm:w-1/3 flex-shrink-0 h-full">
-          <%= bare_sidebar %>
-        </div>
-      <% end %>
     </div>
   <% end %>
   <% if bare_content? %>

data/app/components/avo/panel_component.rb

@@ -10,7 +10,6 @@ class Avo::PanelComponent < ViewComponent::Base
   renders_one :tools
   renders_one :body
   renders_one :sidebar
-  renders_one :bare_sidebar
   renders_one :bare_content
   renders_one :footer_tools
   renders_one :footer

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

@@ -1,18 +1,3 @@
-<% if method.present? %>
-  <%= button_to path,
-    form_class: "flex-1 flex",
-    class: button_classes,
-    target: target,
-    title: title,
-    method: method,
-    params: params do %>
-    <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
-  <% end %>
-<% else %>
-  <%= link_to path,
-    class: button_classes,
-    target: target,
-    title: title do %>
-    <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
-  <% end %>
+<%= link_to path, class: "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-gray-800 font-semibold hover:bg-primary-100 block px-4 py-1 w-full py-3 text-center rounded w-full", target: target, title: title do %>
+  <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
 <% end %>

data/app/components/avo/profile_item_component.rb

@@ -6,29 +6,17 @@ class Avo::ProfileItemComponent < ViewComponent::Base
   attr_reader :path
   attr_reader :active
   attr_reader :target
-  attr_reader :method
-  attr_reader :params
-  attr_reader :classes
 
-  def initialize(label: nil, icon: nil, path: nil, active: :inclusive, target: nil, title: nil, method: nil, params: {}, classes: "")
+  def initialize(label: nil, icon: nil, path: nil, active: :inclusive, target: nil, title: nil)
     @label = label
     @icon = icon
     @path = path
     @active = active
     @target = target
     @title = title
-    @method = method
-    @params = params
-    @classes = classes
   end
 
   def title
     @title || @label
   end
-
-  private
-
-  def button_classes
-    "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-gray-800 font-semibold hover:bg-primary-100 block px-4 py-1 w-full py-3 text-center rounded w-full"
-  end
 end

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

@@ -1,5 +1,3 @@
-<%# via_association_type is used in has_one create actions %>
-<%= hidden_field_tag :via_association_type, params[:via_association_type] if params[:via_association_type] %>
 <%= hidden_field_tag :via_resource_class, params[:via_resource_class] if params[:via_resource_class] %>
 <%= hidden_field_tag :via_record_id, params[:via_record_id] if params[:via_record_id] %>
 <%= hidden_field_tag :via_relation, params[:via_relation] if params[:via_relation] %>