avo 3.0.1.beta24 → 3.0.2

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

@@ -1,115 +1,133 @@
-<% if is_polymorphic? %>
-  <%
-    # Set the model keys so we can pass them over
-    model_keys = @field.types.map do |type|
-      resource = Avo.resource_manager.get_resource_by_model_class(type.to_s)
-      [type.to_s, resource.model_key]
-    end.to_h
-  %>
-  <div class="divide-y"
-    data-controller="belongs-to-field"
-    data-searchable="<%= @field.is_searchable? %>"
-    data-association="<%= @field.id %>"
-    data-association-class="<%= @field&.target_resource&.model_class || nil %>"
-  >
-    <%= field_wrapper **field_wrapper_args, help: @field.polymorphic_help || '' do %>
-      <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [Avo.resource_manager.get_resource_by_model_class(type.to_s).name, type.to_s] },
-      {
-        value: @field.value,
-        include_blank: @field.placeholder,
-      },
-      {
-        class: classes("w-full"),
-        data: {
-          **@field.get_html(:data, view: view, element: :input),
-          action: "change->belongs-to-field#changeType #{field_html_action}",
-          'belongs-to-field-target': "select",
-        },
-        disabled: disabled
-      }
+<div data-controller="reload-belongs-to-field"
+     data-action="turbo:before-stream-render@document->reload-belongs-to-field#beforeStreamRender"
+     data-reload-belongs-to-field-polymorphic-value="<%= is_polymorphic? %>"
+     data-reload-belongs-to-field-searchable-value="<%= @field.is_searchable? %>"
+     data-reload-belongs-to-field-relation-name-value="<%= @field.id %>"
+     data-reload-belongs-to-field-target-name-value="<%= form.object_name %>[<%= @field.id_input_foreign_key %>]"
+>
+  <% if is_polymorphic? %>
+    <%
+      # Set the model keys so we can pass them over
+      model_keys = @field.types.map do |type|
+        resource = Avo.resource_manager.get_resource_by_model_class(type.to_s)
+        [type.to_s, resource.model_key]
+      end.to_h
     %>
-      <%
-        # If the select field is disabled, no value will be sent. It's how HTML works.
-        # Thus the extra hidden field to actually send the related id to the server.
-        if disabled %>
-        <%= @form.hidden_field @field.type_input_foreign_key %>
-      <% end %>
-    <% end %>
-    <% @field.types.each do |type| %>
-      <div class="hidden"
-        data-belongs-to-field-target="type"
-        data-type="<%= type %>"
-      >
-        <%= field_wrapper **field_wrapper_args, label: Avo.resource_manager.get_resource_by_model_class(type.to_s).name do %>
-          <% if @field.is_searchable? %>
-            <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
-              disabled: disabled,
-              field: @field,
-              foreign_key: @field.id_input_foreign_key,
-              model_key: model_keys[type.to_s],
-              polymorphic_record: polymorphic_record,
-              resource: @resource,
-              style: @field.get_html(:style, view: view, element: :input),
-              type: type,
-              classes: classes("w-full"),
-              view: view
-          %>
-          <% else %>
-            <%= @form.select @field.id_input_foreign_key,
-            options_for_select(@field.values_for_type(type), @resource.present? && @resource.record.present? ? @resource.record[@field.id_input_foreign_key] : nil),
-            {
-              value: @resource.record[@field.id_input_foreign_key].to_s,
-              include_blank: @field.placeholder,
-            },
-            {
-              class: classes("w-full"),
-              data: @field.get_html(:data, view: view, element: :input),
-              disabled: disabled
-            }
-          %>
-            <%
-            # If the select field is disabled, no value will be sent. It's how HTML works.
-            # Thus the extra hidden field to actually send the related id to the server.
-            if disabled %>
-              <%= @form.hidden_field @field.id_input_foreign_key %>
-            <% end %>
-          <% end %>
-        <% end %>
-      </div>
-    <% end %>
-  </div>
-<% else %>
-  <%= field_wrapper **field_wrapper_args do %>
-    <% if @field.is_searchable? %>
-      <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
-        field: @field,
-        model_key: @field.target_resource&.model_key,
-        foreign_key: @field.id_input_foreign_key,
-        resource: @resource,
-        disabled: disabled,
-        classes: classes("w-full"),
-        view: view,
-        style: @field.get_html(:style, view: view, element: :input)
-      %>
-    <% else %>
-      <%= @form.select @field.id_input_foreign_key, @field.options,
+    <div class="divide-y"
+      data-controller="belongs-to-field"
+      data-searchable="<%= @field.is_searchable? %>"
+      data-association="<%= @field.id %>"
+      data-association-class="<%= @field&.target_resource&.model_class || nil %>"
+    >
+      <%= field_wrapper **field_wrapper_args, help: @field.polymorphic_help || '' do %>
+        <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [Avo.resource_manager.get_resource_by_model_class(type.to_s).name, type.to_s] },
         {
+          value: @field.value,
           include_blank: @field.placeholder,
-          value: @field.value
         },
         {
           class: classes("w-full"),
-          data: @field.get_html(:data, view: view, element: :input),
-          disabled: disabled,
-          style: @field.get_html(:style, view: view, element: :input)
+          data: {
+            **@field.get_html(:data, view: view, element: :input),
+            action: "change->belongs-to-field#changeType #{field_html_action}",
+            'belongs-to-field-target': "select",
+          },
+          disabled: disabled
         }
       %>
-      <%
-        # If the select field is disabled, no value will be sent. It's how HTML works.
-        # Thus the extra hidden field to actually send the related id to the server.
-        if disabled %>
-        <%= @form.hidden_field @field.id_input_foreign_key %>
+        <%
+          # If the select field is disabled, no value will be sent. It's how HTML works.
+          # Thus the extra hidden field to actually send the related id to the server.
+          if disabled %>
+          <%= @form.hidden_field @field.type_input_foreign_key %>
+        <% end %>
+      <% end %>
+      <% @field.types.each do |type| %>
+        <div class="hidden"
+          data-belongs-to-field-target="type"
+          data-type="<%= type %>"
+        >
+          <%= field_wrapper **field_wrapper_args, label: Avo.resource_manager.get_resource_by_model_class(type.to_s).name do %>
+            <% if @field.is_searchable? %>
+              <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
+                disabled: disabled,
+                field: @field,
+                foreign_key: @field.id_input_foreign_key,
+                model_key: model_keys[type.to_s],
+                polymorphic_record: polymorphic_record,
+                resource: @resource,
+                style: @field.get_html(:style, view: view, element: :input),
+                type: type,
+                classes: classes("w-full"),
+                view: view
+            %>
+            <% else %>
+              <%= @form.select @field.id_input_foreign_key,
+              options_for_select(@field.values_for_type(type), @resource.present? && @resource.record.present? ? @resource.record[@field.id_input_foreign_key] : nil),
+              {
+                value: @resource.record[@field.id_input_foreign_key].to_s,
+                include_blank: @field.placeholder,
+              },
+              {
+                class: classes("w-full"),
+                data: @field.get_html(:data, view: view, element: :input),
+                disabled: disabled
+              }
+            %>
+              <%
+              # If the select field is disabled, no value will be sent. It's how HTML works.
+              # Thus the extra hidden field to actually send the related id to the server.
+              if disabled %>
+                <%= @form.hidden_field @field.id_input_foreign_key %>
+              <% end %>
+            <% end %>
+            <% create_href = create_path(Avo.resource_manager.get_resource_by_model_class(type.to_s)) %>
+            <% if !disabled && create_href.present? %>
+              <%= link_to t("avo.create_new_item", item: type.to_s.downcase),
+                          create_href,
+                          class: "text-sm"
+              %>
+            <% end %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  <% else %>
+    <%= field_wrapper **field_wrapper_args do %>
+      <% if @field.is_searchable? %>
+        <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
+          field: @field,
+          model_key: @field.target_resource&.model_key,
+          foreign_key: @field.id_input_foreign_key,
+          resource: @resource,
+          disabled: disabled,
+          classes: classes("w-full"),
+          view: view,
+          style: @field.get_html(:style, view: view, element: :input)
+        %>
+      <% else %>
+        <%= @form.select @field.id_input_foreign_key, @field.options,
+          {
+            include_blank: @field.placeholder,
+            value: @field.value
+          },
+          {
+            class: classes("w-full"),
+            data: @field.get_html(:data, view: view, element: :input),
+            disabled: disabled,
+            style: @field.get_html(:style, view: view, element: :input)
+          }
+        %>
+        <%
+          # If the select field is disabled, no value will be sent. It's how HTML works.
+          # Thus the extra hidden field to actually send the related id to the server.
+          if disabled %>
+          <%= @form.hidden_field @field.id_input_foreign_key %>
+        <% end %>
+      <% end %>
+      <% if !disabled && create_path.present? %>
+        <%= link_to t("avo.create_new_item", item: @field.name.downcase), create_path, class: "text-sm" %>
       <% end %>
     <% end %>
   <% end %>
-<% end %>
+</div>

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

@@ -57,6 +57,17 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
     @field.get_html(:data, view: view, element: :input).fetch(:action, nil)
   end
 
+  def create_path(target_resource = nil)
+    return nil if @resource.blank?
+
+    helpers.new_resource_path(**{
+      via_relation: @field.id.to_s,
+      resource: target_resource || @field.target_resource,
+      via_record_id: resource.record.to_param,
+      via_belongs_to_resource_class: resource.class.name
+    }.compact)
+  end
+
   private
 
   def visit_through_association?

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

@@ -1,16 +1,18 @@
 <%= field_wrapper **field_wrapper_args do %>
   <% if field.value_as_array? %>
     <div class="flex gap-4">
-      <%= @form.text_field @field.as_lat_long_field_id(:lat),
-        value: @field.as_lat_long_value(:lat),
-        class: classes("w-full"),
-        placeholder: @field.as_lat_long_placeholder(:lat)
-      %>
-      <%= @form.text_field @field.as_lat_long_field_id(:long),
-        value: @field.as_lat_long_value(:long),
-        class: classes("w-full"),
-        placeholder: @field.as_lat_long_placeholder(:long)
-      %>
+      <%= @form.fields_for @field.id do |coordinates_form| %>
+        <%= coordinates_form.text_field @field.as_lat_long_field_id(:lat),
+          value: @field.as_lat_long_value(:lat),
+          class: classes("w-full"),
+          placeholder: @field.as_lat_long_placeholder(:lat)
+        %>
+        <%= coordinates_form.text_field @field.as_lat_long_field_id(:long),
+          value: @field.as_lat_long_value(:long),
+          class: classes("w-full"),
+          placeholder: @field.as_lat_long_placeholder(:long)
+        %>
+    <% end %>
     </div>
   <% else %>
     <%= @form.text_field @field.id,

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

@@ -8,7 +8,7 @@
   <%= 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%>
+    <%= item_selector_input(floating: true, size: :lg) if @resource.record_selector%>
     <%= render_cover %>
   <% end %>
   <div class="grid grid-cols-1 place-content-between p-4 h-full">

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

@@ -12,7 +12,7 @@
     <div class="absolute z-30 w-full ml-10 pt-px hidden" data-item-select-all-target="selectAllOverlay">
       <div class="bg-white flex items-center h-9 mt-0.5">
         <div class="mt-1.5" data-item-select-all-target="unselectedMessage">
-          <%= t "avo.x_records_selected_from_a_total_of_x_html", selected: pagy.in, count: pagy.count %>
+          <%= selected_page_label %>
           <%= a_link request.url,
             size: :xs,
             color: :primary,
@@ -23,7 +23,7 @@
           <% end %>
         </div>
         <div class="mt-1.5" data-item-select-all-target="selectedMessage" class="hidden">
-          <%= t "avo.x_records_selected_from_all_pages_html", count: pagy.count %>
+          <%= selected_all_label %>
           <%= a_link request.url,
             size: :xs,
             color: :primary,

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

@@ -23,4 +23,20 @@ class Avo::Index::ResourceTableComponent < ViewComponent::Base
 
     Avo::Services::EncryptionService.encrypt(message: @query, purpose: :select_all, serializer: Marshal)
   end
+
+  def selected_page_label
+    if @resource.pagination_type.countless?
+      t "avo.x_records_selected_from_page_html", selected: pagy.in
+    else
+      t "avo.x_records_selected_from_a_total_of_x_html", selected: pagy.in, count: pagy.count
+    end
+  end
+
+  def selected_all_label
+    if @resource.pagination_type.countless?
+      t "avo.records_selected_from_all_pages_html"
+    else
+      t "avo.x_records_selected_from_all_pages_html", count: pagy.count
+    end
+  end
 end

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

@@ -9,7 +9,7 @@
   <% if @resource.record_selector %>
     <td class="w-10">
       <div class="flex justify-center h-full">
-        <%== item_selector_input floating: false %>
+        <%= item_selector_input floating: false %>
       </div>
     </td>
   <% end %>

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

@@ -0,0 +1,25 @@
+<%= render Avo::PanelComponent.new(**args) do |c| %>
+  <% if @is_main_panel %>
+    <% c.with_tools do %>
+      <% controls.each do |control| %>
+        <%= render_control control %>
+      <% end %>
+    <% end %>
+  <% end %>
+   <% c.with_body do %>
+    <% content_tag :div, class: "divide-y overflow-auto" do %>
+      <%= render Avo::Items::VisibleItemsComponent.new resource: @resource, item: @item, view: @view, form: @form %>
+    <% end %>
+  <% end %>
+   <% if sidebars.any? { |sidebar| sidebar.visible_items.any? } %>
+    <% c.with_sidebar do %>
+      <div class="justify-between space-y-4">
+        <% sidebars.each_with_index do |sidebar, index| %>
+          <div class="<%= helpers.white_panel_classes if sidebar.panel_wrapper? %>">
+            <%= render Avo::ResourceSidebarComponent.new resource: @resource, sidebar: sidebar, params: params, view: view, form: @form, index: index %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/avo/items/panel_component.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class Avo::Items::PanelComponent < Avo::ResourceComponent
+  include Avo::ApplicationHelper
+
+  def initialize(form:, item:, is_main_panel:, resource:, view:, actions: nil, index: nil, parent_component: nil, parent_record: nil, parent_resource: nil, reflection: nil)
+    @actions = actions
+    @form = form
+    @index = index
+    @is_main_panel = is_main_panel
+    @item = item
+    @parent_component = parent_component
+    @parent_record = parent_record
+    @parent_resource = parent_resource
+    @reflection = reflection
+    @resource = resource
+    @view = view
+  end
+
+  delegate :controls,
+    :title,
+    :back_path,
+    :edit_path,
+    :can_see_the_destroy_button?,
+    :can_see_the_save_button?,
+    :view_for,
+    :display_breadcrumbs,
+    to: :@parent_component
+
+  def args
+    if @is_main_panel
+      {
+        name: title,
+        description: @resource.description,
+        display_breadcrumbs: display_breadcrumbs,
+        index: 0,
+        data: {panel_id: "main"}
+      }
+    else
+      {name: @item.name, description: @item.description, index: @index}
+    end
+  end
+end

data/app/components/avo/items/switcher_component.html.erb

@@ -0,0 +1,17 @@
+<% if item.is_panel? || item.is_main_panel? %>
+  <%= render panel_component %>
+<% elsif item.is_tool? %>
+  <% if item&.partial.present? %>
+    <%= render item.partial, tool: item, form: @form %>
+  <% end %>
+<% elsif item.is_tab_group? %>
+  <%= 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 %>
+      <%= render Avo::Items::VisibleItemsComponent.new resource: @resource, item: @item, view: @view, form: @form %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/avo/items/switcher_component.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+class Avo::Items::SwitcherComponent < Avo::BaseComponent
+  include Turbo::FramesHelper
+
+  attr_reader :resource
+  attr_reader :reflection
+  attr_reader :index
+  attr_reader :item
+  attr_reader :view
+
+  def initialize(
+    resource: nil,
+    reflection: nil,
+    item: nil,
+    index: nil,
+    view: nil,
+    form: nil,
+    parent_resource: nil,
+    parent_record: nil,
+    parent_component: nil,
+    actions: nil,
+    field_component_extra_args: {}
+  )
+    @resource = resource
+    @reflection = reflection
+    @form = form
+    @index = index
+    @item = item
+    @view = view
+    @parent_resource = parent_resource
+    @parent_record = parent_record
+    @parent_component = parent_component
+    @actions = actions
+    @field_component_extra_args = field_component_extra_args
+  end
+
+  def form
+    @form || nil
+  end
+
+  def render?
+    # Stops rendering if the field should be hidden in reflections
+    if item.is_field?
+      return false if in_reflection? && item.hidden_in_reflection?
+    end
+
+    true
+  end
+
+  def in_reflection?
+    @reflection.present?
+  end
+
+  def tab_group_component
+    Avo::TabGroupComponent.new resource: @resource, group: item.hydrate(view: view), index: index, params: params, form: form, view: view
+  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, **@field_component_extra_args)
+  end
+
+  def panel_component
+    Avo::Items::PanelComponent.new(
+      actions: @actions,
+      form: form,
+      index: index,
+      is_main_panel: item.is_main_panel?,
+      item: item.hydrate(view: view),
+      parent_component: @parent_component,
+      parent_record: @parent_record,
+      parent_resource: @parent_resource,
+      reflection: @reflection,
+      resource: @resource,
+      view: view
+    )
+  end
+end

data/app/components/avo/items/visible_items_component.html.erb

@@ -0,0 +1,10 @@
+<% @item.visible_items.each_with_index do |field, index| %>
+  <%= render Avo::Items::SwitcherComponent.new(
+    resource: @resource,
+    item: field,
+    index: index,
+    view: @view,
+    form: @form,
+    field_component_extra_args: @field_component_extra_args,
+  )%>
+<% end %>

data/app/components/avo/items/visible_items_component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Avo::Items::VisibleItemsComponent < ViewComponent::Base
+  def initialize(resource:, item:, view:, form:, field_component_extra_args: {})
+    @resource = resource
+    @item = item
+    @view = view
+    @form = form
+    @field_component_extra_args = field_component_extra_args
+  end
+end

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

@@ -3,15 +3,19 @@
   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 inset-auto bg-white flex z-50 relative shadow-modal overflow-auto <%= width_classes %> <%= height_classes %>">
     <div class="flex-1 flex flex-col justify-between">
       <div>
-        <div class="p-6 pb-0 text-2xl tracking-normal font-semibold text-black">
-          <%= heading %>
-        </div>
-        <div class="p-6 text-base text-gray-500">
-          <%= content %>
-        </div>
+        <% if heading? %>
+          <div class="p-6 pb-0 text-2xl tracking-normal font-semibold text-black">
+            <%= heading %>
+          </div>
+        <% end %>
+        <% if content? %>
+          <div class="p-6 text-base text-gray-500">
+            <%= content %>
+          </div>
+        <% end %>
       </div>
       <% if controls? %>
         <div class="flex justify-end items-baseline space-x-4 p-4 bg-gray-100">

data/app/components/avo/modal_component.rb

@@ -3,4 +3,25 @@
 class Avo::ModalComponent < ViewComponent::Base
   renders_one :heading
   renders_one :controls
+
+  attr_reader :width
+  attr_reader :body_class
+
+  def initialize(width: :md, body_class: nil)
+    @width = width
+    @body_class = body_class
+  end
+
+  def width_classes
+    case width.to_sym
+    when :md
+      "w-11/12 lg:w-1/2 sm:max-w-168"
+    when :xl
+      "w-11/12 lg:w-3/4"
+    end
+  end
+
+  def height_classes
+    "max-h-full min-h-1/4 max-h-11/12"
+  end
 end