avo 2.15.3 → 2.16.1.pre.1.nativefields

data/app/components/avo/resource_component.rb

@@ -46,7 +46,11 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def destroy_path
-    helpers.resource_path(model: @resource.model, resource: @resource)
+    if params[:via_resource_class].present?
+      helpers.resource_path(model: @resource.model, resource: @resource, referrer: back_path)
+    else
+      helpers.resource_path(model: @resource.model, resource: @resource)
+    end
   end
 
   def authorize_association_for(policy_method)

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

@@ -1,11 +1,11 @@
 <% if item.is_a? Avo::Menu::Link %>
-  <%= render Avo::Sidebar::LinkComponent.new label: item.name, path: item.path, target: item.target %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.name, path: item.path, target: item.target, data: item.data %>
 <% end %>
 <% if item.is_a? Avo::Menu::Resource %>
-  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: helpers.resources_path(resource: resource) %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: helpers.resources_path(resource: resource), data: item.data %>
 <% end %>
 <% if item.is_a? Avo::Menu::Dashboard %>
-  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: dashboard.navigation_path %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: dashboard.navigation_path, data: item.data %>
 <% end %>
 <% if item.is_a? Avo::Menu::Section %>
   <%= render Avo::Sidebar::SectionComponent.new item: item %>

data/app/components/avo/sidebar/link_component.html.erb

@@ -1,12 +1,12 @@
 <% if path.present? %>
-  <%= send link_method, path, class: classes, active: active, target: target do %>
+  <%= send link_method, path, class: classes, active: active, target: target, data: data do %>
     <%= label %>
     <% if target == :_blank %>
       <%= helpers.svg('heroicons/outline/external-link', class: 'self-center ml-auto h-3 mr-2') %>
     <% end %>
   <% end %>
 <% else %>
-  <%= content_tag :div, class: classes, active: active, target: target do %>
+  <%= content_tag :div, class: classes, active: active, target: target, data: data do %>
     <%= label %>
   <% end %>
 <% end %>

data/app/components/avo/sidebar/link_component.rb

@@ -5,12 +5,14 @@ class Avo::Sidebar::LinkComponent < ViewComponent::Base
   attr_reader :target
   attr_reader :label
   attr_reader :path
+  attr_reader :data
 
-  def initialize(label: nil, path: nil, active: :inclusive, target: nil)
+  def initialize(label: nil, path: nil, active: :inclusive, target: nil, data: {})
     @label = label
     @path = path
     @active = active
     @target = target
+    @data = data
   end
 
   def is_external?

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

@@ -15,22 +15,40 @@
     },
     multipart: true do |form| %>
     <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
-    <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
-      <% c.tools do %>
-        <%= a_link back_path,
+    <%= content_tag :div, class: 'space-y-12' do %>
+      <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
+        <% c.tools do %>
+          <%= a_link back_path,
         style: :text,
         icon: 'arrow-left' do %>
           <%= t('avo.cancel').capitalize %>
         <% end %>
+        <% if can_see_the_destroy_button? %>
+          <%= a_link destroy_path,
+            method: :delete,
+            local: true,
+            style: :text,
+            loading: true,
+            confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
+            color: :red,
+            icon: 'trash',
+            form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+            data: {
+              control: :destroy,
+              'resource-id': @resource.model.id,
+            } do %>
+            <%= t('avo.delete').capitalize %>
+          <% end %>
+        <% end %>
         <% if can_see_the_actions_button? %>
           <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
         <% end %>
         <% if can_see_the_save_button? %>
           <%= a_button color: :primary,
-              style: :primary,
-              loading: true,
-              type: :submit,
-              icon: 'save' do %>
+            style: :primary,
+            loading: true,
+            type: :submit,
+            icon: 'save' do %>
             <%= t('avo.save').capitalize %>
           <% end %>
         <% end %>
@@ -41,39 +59,40 @@
         <% c.body do %>
           <div class="divide-y">
             <% main_panel.items.each_with_index do |field, index| %>
-              <%= render field.hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view)
-                .component_for_view(view)
+              <%= render field.hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view_for(field))
+                .component_for_view(view_for field)
                 .new(field: field, resource: @resource, index: index, form: form)
               %>
-            <% end %>
-          </div>
+              <% end %>
+            </div>
+          <% end %>
         <% end %>
-      <% end %>
-      <% if Avo.configuration.buttons_on_form_footers %>
-        <% c.footer_tools do %>
-          <div class="mt-4">
-            <%= a_link back_path,
+        <% if Avo.configuration.buttons_on_form_footers %>
+          <% c.footer_tools do %>
+            <div class="mt-4">
+              <%= a_link back_path,
               style: :text,
               icon: 'arrow-left' do %>
-              <%= t('avo.cancel').capitalize %>
-            <% end %>
-            <% if can_see_the_save_button? %>
-              <%= a_button color: :primary,
+                <%= t('avo.cancel').capitalize %>
+              <% end %>
+              <% if can_see_the_save_button? %>
+                <%= a_button color: :primary,
                 style: :primary,
                 loading: true,
                 type: :submit,
                 icon: 'save' do %>
-                <%= t('avo.save').capitalize %>
+                  <%= t('avo.save').capitalize %>
+                <% end %>
               <% end %>
-            <% end %>
-          </div>
+            </div>
+          <% end %>
         <% end %>
       <% end %>
-    <% end %>
-    <%= content_tag :div, class: 'space-y-12 mt-12' do %>
-      <% @resource.get_items.each_with_index do |item, index| %>
-        <% next if item.nil? %>
-        <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: item, index: index + 1, view: @view, form: form %>
+      <%= content_tag :div, class: 'space-y-12' do %>
+        <% @resource.get_items.each_with_index do |item, index| %>
+          <% next if item.nil? %>
+          <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: item, index: index + 1, view: @view, form: form %>
+        <% end %>
       <% end %>
     <% end %>
   <% end %>

data/app/components/avo/views/resource_edit_component.rb

@@ -16,16 +16,28 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   end
 
   def back_path
-    if via_resource?
-      model = params[:via_resource_class] || params[:via_relation_class]
-      helpers.resource_path(model: model.safe_constantize, resource: relation_resource, resource_id: params[:via_resource_id])
-    elsif via_index?
-      helpers.resources_path(resource: @resource)
-    elsif is_edit? # via resource show page
-      helpers.resource_path(model: @resource.model, resource: @resource)
-    else
-      helpers.resources_path(resource: @resource)
+    return resource_view_path if via_resource?
+    return resources_path if via_index?
+
+    if is_edit? && Avo.configuration.resource_default_view == :show # via resource show or edit page
+      return helpers.resource_path(model: @resource.model, resource: @resource)
     end
+
+    resources_path
+  end
+
+  def resources_path
+    helpers.resources_path(resource: @resource)
+  end
+
+  def resource_view_path
+    helpers.resource_view_path(model: relation_resource.model, resource: relation_resource)
+  end
+
+  def can_see_the_destroy_button?
+    return super if is_edit? && Avo.configuration.resource_default_view == :edit
+
+    false
   end
 
   # The save button is dependent on the edit? policy method.
@@ -65,4 +77,9 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
       )
     end
   end
+
+  # Render :show view for read only trix fields
+  def view_for(field)
+    (field.is_a? Avo::Fields::TrixField) && field.is_readonly? ? :show : view
+  end
 end

data/app/components/avo/views/resource_show_component.rb

@@ -45,14 +45,6 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
     helpers.edit_resource_path(model: @resource.model, resource: @resource, **args)
   end
 
-  def destroy_path
-    if params[:via_resource_class].present?
-      helpers.resource_path(model: @resource.model, resource: @resource, referrer: back_path)
-    else
-      helpers.resource_path(model: @resource.model, resource: @resource)
-    end
-  end
-
   private
 
   # In development and test environments we shoudl show the invalid field errors

data/app/controllers/avo/actions_controller.rb

@@ -4,9 +4,15 @@ module Avo
   class ActionsController < ApplicationController
     before_action :set_resource_name
     before_action :set_resource
+    before_action :set_model, only: :show, if: ->(request) do
+      # Try to se the model only if the user is on the record page.
+      # set_model will fail if it's tried to be used from the Index page.
+      request.params[:id].present?
+    end
     before_action :set_action, only: [:show, :handle]
 
     def show
+      @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
       @model = ActionModel.new @action.get_attributes_for_action
     end
 
@@ -44,11 +50,7 @@ module Avo
     def set_action
       action_class = params[:action_id].gsub("avo_actions_", "").camelize.safe_constantize
 
-      if params[:id].present?
-        model = @resource.class.find_scope.find params[:id]
-      end
-
-      @action = action_class.new(model: model, resource: resource, user: _current_user, view: :edit)
+      @action = action_class.new(model: @model, resource: @resource, user: _current_user, view: :edit)
     end
 
     def respond(response)

data/app/controllers/avo/application_controller.rb

@@ -16,6 +16,7 @@ module Avo
     before_action :set_default_locale, if: -> { params[:set_locale].present? }
     before_action :init_app
     before_action :check_avo_license
+    before_action :set_resource_name
     before_action :set_authorization
     before_action :_authenticate!
     before_action :set_container_classes
@@ -26,7 +27,7 @@ module Avo
     rescue_from Pundit::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
 
-    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?
+    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?, :resource_view_path
     add_flash_types :info, :warning, :success, :error
 
     def init_app
@@ -126,7 +127,19 @@ module Avo
     end
 
     def set_model
-      @model = eager_load_files(@resource, @resource.class.find_scope).find params[:id]
+      @model = model_find_scope.find record_id
+    end
+
+    def record_id
+      params.permit(:id).dig(:id)
+    end
+
+    def model_find_scope
+      eager_load_files(@resource, model_scope)
+    end
+
+    def model_scope
+      @resource.class.find_scope
     end
 
     def set_related_model
@@ -257,7 +270,13 @@ module Avo
     end
 
     def set_authorization
-      @authorization = Services::AuthorizationService.new _current_user
+      # We need to set @resource_name for the #resource method to work properly
+      set_resource_name
+      @authorization = if resource
+        resource.authorization(user: _current_user)
+      else
+        Services::AuthorizationService.new _current_user
+      end
     end
 
     def set_container_classes

data/app/controllers/avo/associations_controller.rb

@@ -65,7 +65,7 @@ module Avo
 
       respond_to do |format|
         if @model.save
-          format.html { redirect_back fallback_location: resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_attached", attachment_class: @related_resource.name) }
+          format.html { redirect_back fallback_location: resource_view_response_path, notice: t("avo.attachment_class_attached", attachment_class: @related_resource.name) }
         else
           format.html { render :new }
         end
@@ -80,7 +80,7 @@ module Avo
       end
 
       respond_to do |format|
-        format.html { redirect_to params[:referrer] || resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_detached", attachment_class: @attachment_class) }
+        format.html { redirect_to params[:referrer] || resource_view_response_path, notice: t("avo.attachment_class_detached", attachment_class: @attachment_class) }
       end
     end
 

data/app/controllers/avo/base_controller.rb

@@ -84,7 +84,7 @@ module Avo
 
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_resource_id].present?
-        via_resource = Avo::App.get_resource_by_model_name params[:via_resource_class]
+        via_resource = Avo::App.get_resource_by_model_name(params[:via_resource_class]).dup
         via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
@@ -106,8 +106,8 @@ module Avo
 
       @page_title = @resource.default_panel_name.to_s
 
-      if params[:via_relation_class].present? && params[:via_resource_id].present?
-        via_resource = Avo::App.get_resource_by_model_name params[:via_relation_class]
+      if is_associated_record?
+        via_resource = Avo::App.get_resource_by_model_name(params[:via_relation_class]).dup
         via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
@@ -139,7 +139,7 @@ module Avo
         # For when working with has_one, has_one_through, has_many_through, has_and_belongs_to_many, polymorphic
         if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
           # find the record
-          via_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class]
+          via_resource = ::Avo::App.get_resource_by_model_name(params[:via_relation_class]).dup
           @related_record = via_resource.model_class.find params[:via_resource_id]
 
           @model.send(params[:via_relation]) << @related_record
@@ -370,7 +370,7 @@ module Avo
       last_crumb_args = {}
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_resource_id].present?
-        via_resource = Avo::App.get_resource_by_model_name params[:via_resource_class]
+        via_resource = Avo::App.get_resource_by_model_name(params[:via_resource_class]).dup
         via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
@@ -412,13 +412,17 @@ module Avo
 
     def after_create_path
       # If this is an associated record return to the association show page
-      if params[:via_relation_class].present? && params[:via_resource_id].present?
-        parent_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class]
+      if is_associated_record?
+        parent_resource = ::Avo::App.get_resource_by_model_name(params[:via_relation_class]).dup
 
-        return resource_path(model: params[:via_relation_class], resource: parent_resource, resource_id: params[:via_resource_id])
+        return resource_view_path(
+          model: @model.send(params[:via_relation]),
+          resource: parent_resource,
+          resource_id: params[:via_resource_id]
+        )
       end
 
-      redirect_path_from_resource_option(:after_create_path) || resource_path(model: @model, resource: @resource)
+      redirect_path_from_resource_option(:after_create_path) || resource_view_response_path
     end
 
     def update_success_action
@@ -445,7 +449,12 @@ module Avo
     def after_update_path
       return params[:referrer] if params[:referrer].present?
 
-      redirect_path_from_resource_option(:after_update_path) || resource_path(model: @model, resource: @resource)
+      redirect_path_from_resource_option(:after_update_path) || resource_view_response_path
+    end
+
+    # Needs a different name, otwherwise, in some places, this can be called instead helpers.resource_view_path
+    def resource_view_response_path
+      helpers.resource_view_path(model: @model, resource: @resource)
     end
 
     def destroy_success_action
@@ -477,11 +486,15 @@ module Avo
 
       if @resource.class.send(action) == :index
         resources_path(resource: @resource)
-      elsif @resource.class.send(action) == :edit
+      elsif @resource.class.send(action) == :edit || Avo.configuration.resource_default_view == :edit
         edit_resource_path(resource: @resource, model: @resource.model)
       else
         resource_path(model: @model, resource: @resource)
       end
     end
+
+    def is_associated_record?
+      params[:via_relation_class].present? && params[:via_resource_id].present?
+    end
   end
 end

data/app/helpers/avo/application_helper.rb

@@ -17,18 +17,18 @@ module Avo
     end
 
     def empty_state(**args)
-      render Avo::EmptyStateComponent.new **args
+      render Avo::EmptyStateComponent.new(**args)
     end
 
     def a_button(**args, &block)
       render Avo::ButtonComponent.new(is_link: false, **args) do
-        capture(&block) if block_given?
+        capture(&block) if block
       end
     end
 
     def a_link(path = nil, **args, &block)
       render Avo::ButtonComponent.new(path, is_link: true, **args) do
-        capture(&block) if block_given?
+        capture(&block) if block
       end
     end
 
@@ -114,5 +114,33 @@ module Avo
 
       output
     end
+
+    def avo_field(type = nil, id = nil, as: nil, view: :show, form: nil, component_options: {}, **args, &block)
+      if as.present?
+        id = type
+        type = as
+      end
+      field_klass = "Avo::Fields::#{type.to_s.camelize}Field".safe_constantize
+      field = field_klass.new id, form: form, view: view, **args, &block
+
+      # Add the form record to the field so all fields have access to it.
+      field.hydrate(model: form.object)
+
+      render field.component_for_view(view).new field: field, form: form, **component_options
+    end
+
+    def avo_show_field(id, type = nil, view: :show, **args, &block)
+      avo_field(id, type, **args, view: view, &block)
+    end
+
+    def avo_edit_field(id, type = nil, view: :edit, **args, &block)
+      avo_field(id, type, **args, view: view, &block)
+    end
+
+    def field_container(**args, &block)
+      classes = args[:class] || ""
+      classes << "flex flex-col divide-y"
+      content_tag :div, **args, class: classes, &block
+    end
   end
 end

data/app/helpers/avo/resources_helper.rb

@@ -20,17 +20,13 @@ module Avo
       end
     end
 
-    def show_field_wrapper(**args, &block)
-      render Show::FieldWrapperComponent.new(**args) do
-        capture(&block)
-      end
-    end
-
-    def edit_field_wrapper(**args, &block)
-      render Edit::FieldWrapperComponent.new(**args) do
+    def field_wrapper(**args, &block)
+      render Avo::FieldWrapperComponent.new(**args) do
         capture(&block)
       end
     end
+    alias :edit_field_wrapper :field_wrapper
+    alias :show_field_wrapper :field_wrapper
 
     def filter_wrapper(name: nil, index: nil, **args, &block)
       render layout: "layouts/avo/filter_wrapper", locals: {

data/app/helpers/avo/url_helpers.rb

@@ -76,5 +76,13 @@ module Avo
 
       avo.resources_associations_index_path(parent_model.model_name.route_key, record.id, **existing_params, **args)
     end
+
+    def resource_view_path(**args)
+      if Avo.configuration.resource_default_view == :edit
+        edit_resource_path(**args)
+      else
+        resource_path(**args)
+      end
+    end
   end
 end

data/app/javascript/js/controllers/action_controller.js

@@ -1,5 +1,5 @@
-import { Controller } from '@hotwired/stimulus'
 import { castBoolean } from '../helpers/cast_boolean'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
   static targets = ['controllerDiv', 'resourceIds', 'form', 'selectedAllQuery']
@@ -7,6 +7,8 @@ export default class extends Controller {
   connect() {
     this.resourceIdsTarget.value = this.resourceIds
 
+    console.log('something')
+
     // This value is picked up from the DOM so we check true/false as strings
     if (this.selectionOptions.itemSelectAllSelectedAllValue === 'true') {
       this.selectedAllQueryTarget.value = this.selectionOptions.itemSelectAllSelectedAllQueryValue

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

@@ -21,6 +21,10 @@ export default class extends Controller {
     disableMobile: Boolean,
   }
 
+  flatpickrInstance;
+
+  cachedInitialValue;
+
   get browserZone() {
     const time = DateTime.local()
 
@@ -59,6 +63,10 @@ export default class extends Controller {
   }
 
   connect() {
+    // Cache the initial value so we can fill it back on disconnection.
+    // We do that so the JS parser will continue to work when the user hits the back button to return on this page.
+    this.cacheInitialValue()
+
     if (this.isOnShow || this.isOnIndex) {
       this.initShow()
     } else if (this.isOnEdit) {
@@ -66,6 +74,18 @@ export default class extends Controller {
     }
   }
 
+  disconnect() {
+    if (this.isOnShow || this.isOnIndex) {
+      this.context.element.innerText = this.cachedInitialValue
+    } else if (this.isOnEdit) {
+      if (this.flatpickrInstance) this.flatpickrInstance.destroy()
+    }
+  }
+
+  cacheInitialValue() {
+    this.cachedInitialValue = this.initialValue
+  }
+
   // Turns the value in the controller wrapper into the timezone of the browser
   initShow() {
     let value = this.parsedValue
@@ -115,7 +135,7 @@ export default class extends Controller {
       options.defaultDate = universalTimestamp(this.initialValue)
     }
 
-    flatpickr(this.fakeInputTarget, options)
+    this.flatpickrInstance = flatpickr(this.fakeInputTarget, options)
 
     if (this.enableTimeValue) {
       this.updateRealInput(this.parsedValue.setZone(this.displayTimezone).toISO())