avo 1.6.4.pre.1 → 1.7.3

data/app/components/avo/fields/common/single_file_viewer_component.html.erb

@@ -17,7 +17,7 @@
       <%= a_link helpers.main_app.url_for(@file), color: 'indigo', download: true, class: '', size: :md do %>
         <%= helpers.svg 'download' %> <%= t('avo.download_file') %>
       <% end %>
-      <%= a_link "#{Avo.configuration.root_path}/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id
+      <%= a_link "#{Avo::App.root_path}/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id
       }/active_storage_attachments/#{@id}/#{@file.id}", color: :red, variant: :outlined, size: :md, class: '', 'data-turbo-frame': 'destroy_attachment_form', data: { confirm: t('avo.are_you_sure')} do %>
         <%= helpers.svg 'trash' %> <%= t 'avo.delete_file', item: @file.filename %>
       <% end %>

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

@@ -1,7 +1,7 @@
 <%= index_field_wrapper field: @field do %>
   <% if @field.value.present? %>
     <% if @field.value.attached? && @field.value.representable? && @field.is_image %>
-      <%= link_to_if @field.link_to_resource, image_tag(@field.variant, class: 'max-h-full'), resource_path, class: 'block h-8' %>
+      <%= link_to_if @field.link_to_resource, image_tag(helpers.main_app.url_for(@field.value), class: 'max-h-full'), resource_path, class: 'block h-8' %>
     <% else %>
       <%= @field.value.filename %>
     <% end %>

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

@@ -6,6 +6,9 @@
     data-resource-id="<%= @resource.model.id %>"
     data-attachments-disabled="<%= @field.attachments_disabled %>"
     data-attachment-key="<%= @field.attachment_key %>"
+    data-hide-attachment-filename="<%= @field.hide_attachment_filename %>"
+    data-hide-attachment-filesize="<%= @field.hide_attachment_filesize %>"
+    data-hide-attachment-url="<%= @field.hide_attachment_url %>"
   >
     <% trix_id = "trix_#{@resource.name.underscore}_#{@field.id}" %>
     <trix-editor data-trix-field-target="editor" input="<%= trix_id %>" placeholder="<%= @field.placeholder %>"><%== @field.value %></trix-editor>

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

@@ -10,18 +10,16 @@
       <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), 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(cover.variant(resize_to_limit: [480, 480]), class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+        <%= 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'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
       <% else %>
         <div class="absolute bg-gray-100 w-full h-full">
           <%= helpers.svg 'avocado', class: 'relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2' %>
         </div>
       <% end %>
+    <% elsif cover.value.present? %>
+      <%= link_to_if cover.link_to_resource, image_tag(cover.value, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
     <% else %>
-      <% if cover.value.present? %>
-        <%= link_to_if cover.link_to_resource, image_tag(cover.value, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
-      <% else %>
-        <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
-      <% end %>
+      <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
     <% end %>
   </div>
   <div class="grid grid-cols-1 place-content-between p-4 h-full">

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

@@ -1,62 +1,64 @@
-<%= render Avo::PanelComponent.new(title: title, body_classes: 'py-4', data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
-  <% c.tools do %>
-    <%= render 'actions' if @actions.present? %>
+<div>
+  <%= render Avo::PanelComponent.new(title: title, body_classes: 'py-4', data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
+    <% c.tools do %>
+      <%= render 'actions' if @actions.present? %>
 
-    <% if can_create? %>
-      <%= a_link create_path do %>
-        <%= svg 'plus' %> <%= t('avo.create_new_item', item: @resource.model_class.model_name.human.downcase ) %>
+      <% if can_create? %>
+        <%= a_link create_path do %>
+          <%= svg 'plus' %> <%= t('avo.create_new_item', item: @resource.model_class.model_name.human.downcase ) %>
+        <% end %>
       <% end %>
-    <% end %>
 
-    <% if can_detach? %>
-      <%= a_link detach_path, color: 'indigo', method: :delete, data: { confirm: "Are you sure you want to detach this #{@resource.singular_name}." } do %>
-        <%= svg 'trash' %> <%= t('avo.detach_item', item: @resource.singular_name).capitalize %>
+      <% if can_detach? %>
+        <%= a_link detach_path, color: 'indigo', method: :delete, data: { confirm: "Are you sure you want to detach this #{@resource.singular_name}." } do %>
+          <%= svg 'trash' %> <%= t('avo.detach_item', item: @resource.singular_name).capitalize %>
+        <% end %>
       <% end %>
-    <% end %>
 
-    <% if can_attach? %>
-      <%= a_link attach_path, color: 'indigo', 'data-turbo-frame': 'attach_modal' do %>
-        <%= svg 'view-grid-add' %> <%= t('avo.attach_item', item: @resource.singular_name).capitalize %>
+      <% if can_attach? %>
+        <%= a_link attach_path, color: 'indigo', 'data-turbo-frame': 'attach_modal' do %>
+          <%= svg 'view-grid-add' %> <%= t('avo.attach_item', item: @resource.singular_name).capitalize %>
+        <% end %>
       <% end %>
     <% end %>
-  <% end %>
 
-  <% c.body do %>
-    <div class="flex justify-between pt-2 pb-2 min-h-16"
-      data-selected-resources-name="<%= @resource.plural_name.downcase %>"
-      data-selected-resources="[]"
-    >
-      <div class="flex items-center px-6 w-64">
-        <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key} if @resource.search_query.present? %>
-      </div>
-      <div class="flex justify-end items-center px-6 space-x-3">
-        <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if @models.present? %>
-        <%= render 'filters' if @filters.present? %>
-      </div>
-    </div>
-
-    <% if view_type.to_sym == :table %>
-      <div class="w-full overflow-auto flex flex-col mt-4">
-        <div class="relative flex-1 flex">
-          <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model)) %>
+    <% c.body do %>
+      <div class="flex justify-between pt-2 pb-2 min-h-16"
+        data-selected-resources-name="<%= @resource.plural_name.downcase %>"
+        data-selected-resources="[]"
+      >
+        <div class="flex items-center px-6 w-64">
+          <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key} if @resource.search_query.present? %>
+        </div>
+        <div class="flex justify-end items-center px-6 space-x-3">
+          <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if @models.present? %>
+          <%= render 'filters' if @filters.present? %>
         </div>
+      </div>
 
-        <% if @models.present? %>
-          <div class="py-4">
-            <%= render partial: 'avo/partials/paginator', locals: { pagy: @pagy, turbo_frame: @turbo_frame || 'none' } %>
+      <% if view_type.to_sym == :table %>
+        <div class="w-full overflow-auto flex flex-col mt-4">
+          <div class="relative flex-1 flex">
+            <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model)) %>
           </div>
-        <% end %>
-      </div>
+
+          <% if @models.present? %>
+            <div class="py-4">
+              <%= render partial: 'avo/partials/paginator', locals: { pagy: @pagy, turbo_frame: @turbo_frame || 'none' } %>
+            </div>
+          <% end %>
+        </div>
+      <% end %>
     <% end %>
-  <% end %>
 
-  <% c.bare_content do %>
-    <% if view_type.to_sym == :grid %>
-      <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
+    <% c.bare_content do %>
+      <% if view_type.to_sym == :grid %>
+        <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
 
-      <div class="bg-white rounded-xl shadow-xl mt-8 py-6">
-        <%= render partial: 'avo/partials/paginator', locals: { pagy: @pagy, turbo_frame: @turbo_frame || 'none' } %>
-      </div>
+        <div class="bg-white rounded-xl shadow-xl mt-8 py-6">
+          <%= render partial: 'avo/partials/paginator', locals: { pagy: @pagy, turbo_frame: @turbo_frame || 'none' } %>
+        </div>
+      <% end %>
     <% end %>
   <% end %>
-<% end %>
+</div>

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

@@ -77,7 +77,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def attach_path
-    "#{Avo.configuration.root_path}#{request.env["PATH_INFO"]}/new"
+    "#{Avo::App.root_path}#{request.env["PATH_INFO"]}/new"
   end
 
   def detach_path

data/app/controllers/avo/application_controller.rb

@@ -17,7 +17,7 @@ module Avo
     add_flash_types :info, :warning, :success, :error
 
     def init_app
-      Avo::App.init request: request, context: context, current_user: _current_user
+      Avo::App.init request: request, context: context, root_path: avo.root_path.delete_suffix("/"), current_user: _current_user
 
       @license = Avo::App.license
     end
@@ -78,6 +78,7 @@ module Avo
           existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
         end
       rescue; end
+
       avo.send :"resources_#{model.model_name.route_key}_path", **existing_params, **args
     end
 
@@ -91,7 +92,7 @@ module Avo
           existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
         end
       rescue; end
-      Addressable::Template.new("#{Avo.configuration.root_path}/resources/#{@parent_resource.model.model_name.route_key}/#{@parent_resource.model.id}/#{@resource.route_key}{?query*}")
+      Addressable::Template.new("#{Avo::App.root_path}/resources/#{@parent_resource.model.model_name.route_key}/#{@parent_resource.model.id}/#{@resource.route_key}{?query*}")
         .expand({query: {**existing_params, **args}})
         .to_str
     end
@@ -103,7 +104,7 @@ module Avo
     end
 
     def resource_attach_path(model_name, model_id, related_name, related_id = nil)
-      path = "#{Avo.configuration.root_path}/resources/#{model_name}/#{model_id}/#{related_name}/new"
+      path = "#{Avo::App.root_path}/resources/#{model_name}/#{model_id}/#{related_name}/new"
 
       path += "/#{related_id}" if related_id.present?
 
@@ -111,7 +112,7 @@ module Avo
     end
 
     def resource_detach_path(model_name, model_id, related_name, related_id = nil)
-      path = "#{Avo.configuration.root_path}/resources/#{model_name}/#{model_id}/#{related_name}"
+      path = "#{Avo::App.root_path}/resources/#{model_name}/#{model_id}/#{related_name}"
 
       path += "/#{related_id}" if related_id.present?
 
@@ -147,7 +148,8 @@ module Avo
     end
 
     def set_model
-      @model = eager_load_files(@resource, @resource.model_class).find params[:id]
+      # @model = eager_load_files(@resource, @resource.model_class).find params[:id]
+      @model = @resource.model_class.find params[:id]
     end
 
     def set_related_model
@@ -179,7 +181,7 @@ module Avo
 
       begin
         request.path
-          .match(/\/?#{Avo.configuration.root_path.delete('/')}\/resources\/([a-z1-9\-_]*)\/?/mi)
+          .match(/\/?#{Avo::App.root_path.delete('/')}\/resources\/([a-z1-9\-_]*)\/?/mi)
           .captures
           .first
       rescue
@@ -273,15 +275,15 @@ module Avo
     end
 
     def on_root_path
-      [Avo.configuration.root_path, "#{Avo.configuration.root_path}/"].include?(request.original_fullpath)
+      [Avo::App.root_path, "#{Avo::App.root_path}/"].include?(request.original_fullpath)
     end
 
     def on_resources_path
-      request.original_url.match?(/.*#{Avo.configuration.root_path}\/resources\/.*/)
+      request.original_url.match?(/.*#{Avo::App.root_path}\/resources\/.*/)
     end
 
     def on_api_path
-      request.original_url.match?(/.*#{Avo.configuration.root_path}\/avo_api\/.*/)
+      request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
     end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -7,6 +7,8 @@ module Avo
     before_action :hydrate_resource
     before_action :authorize_action
     before_action :set_model, only: [:show, :edit, :destroy, :update]
+    before_action :reset_pagination_if_filters_changed, only: :index
+    before_action :cache_applied_filters, only: :index
 
     def index
       @page_title = resource_name.humanize
@@ -21,6 +23,11 @@ module Avo
         @query = @authorization.apply_policy @resource.model_class
       end
 
+      # Remove default_scope for index view
+      if @resource.unscoped_queries_on_index
+        @query = @query.unscoped
+      end
+
       # Eager load the relations
       if @resource.includes.present?
         @query = @query.includes(*@resource.includes)
@@ -255,5 +262,19 @@ module Avo
 
       filter_defaults
     end
+
+    def cache_applied_filters
+      ::Avo::App.cache_store.delete applied_filters_cache_key if params[:filters].nil?
+
+      ::Avo::App.cache_store.write(applied_filters_cache_key, params[:filters], expires_in: 7.days)
+    end
+
+    def reset_pagination_if_filters_changed
+      params[:page] = 1 if params[:filters] != ::Avo::App.cache_store.read(applied_filters_cache_key)
+    end
+
+    def applied_filters_cache_key
+      "avo.base_controller.#{@resource.route_key}.applied_filters"
+    end
   end
 end

data/app/controllers/avo/search_controller.rb

@@ -2,6 +2,8 @@ require_dependency "avo/application_controller"
 
 module Avo
   class SearchController < ApplicationController
+    include Rails.application.routes.url_helpers
+
     before_action :set_resource_name, only: [:show]
     before_action :set_resource, only: [:show]
 
@@ -61,7 +63,7 @@ module Avo
 
         if App.license.has_with_trial(:enhanced_search_results)
           result[:_description] = resource.description
-          result[:_avatar] = resource.avatar
+          result[:_avatar] = resource.avatar.present? ? main_app.url_for(resource.avatar) : nil
           result[:_avatar_type] = resource.avatar_type
         end
 

data/app/packs/js/controllers/fields/belongs_to_field_controller.js

@@ -0,0 +1,65 @@
+import { Controller } from 'stimulus'
+
+export default class extends Controller {
+  static targets = ['select', 'type']
+
+  get selectedType() {
+    return this.selectTarget.value
+  }
+
+  connect() {
+    this.setValidNames()
+    this.changedType()
+  }
+
+  setValidNames() {
+    this.typeTargets.forEach((target) => {
+      const { type } = target.dataset
+      const select = target.querySelector('select')
+      const name = select.getAttribute('name')
+
+      select.setAttribute('valid-name', name)
+      if (this.selectedType !== type) {
+        select.selectedIndex = 0
+      }
+    })
+  }
+
+  changedType() {
+    this.hideAllTypeTargets()
+    this.enableType(this.selectTarget.value)
+  }
+
+  hideAllTypeTargets() {
+    this.typeTargets.forEach((target) => {
+      this.hideTarget(target)
+      this.invalidateTarget(target)
+    })
+  }
+
+  hideTarget(target) {
+    target.classList.add('hidden')
+  }
+
+  invalidateTarget(target) {
+    const select = target.querySelector('select')
+
+    select.setAttribute('name', '')
+  }
+
+  validateTarget(target) {
+    const select = target.querySelector('select')
+    const validName = select.getAttribute('valid-name')
+
+    select.setAttribute('name', validName)
+  }
+
+  enableType(type) {
+    const target = this.typeTargets.find((typeTarget) => typeTarget.dataset.type === type)
+
+    if (target) {
+      target.classList.remove('hidden')
+      this.validateTarget(target)
+    }
+  }
+}

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

@@ -21,6 +21,18 @@ export default class extends Controller {
     return castBoolean(this.controllerTarget.dataset.attachmentsDisabled)
   }
 
+  get hideAttachmentFilename() {
+    return castBoolean(this.controllerTarget.dataset.hideAttachmentFilename)
+  }
+
+  get hideAttachmentFilesize() {
+    return castBoolean(this.controllerTarget.dataset.hideAttachmentFilesize)
+  }
+
+  get hideAttachmentUrl() {
+    return castBoolean(this.controllerTarget.dataset.hideAttachmentUrl)
+  }
+
   get uploadUrl() {
     return `${window.location.origin}${window.Avo.configuration.root_path}/avo_api/resources/${this.resourceName}/${this.resourceId}/attachments`
   }
@@ -102,6 +114,10 @@ export default class extends Controller {
           href: response.href,
         }
 
+        if (this.hideAttachmentFilename) attributes.filename = null
+        if (this.hideAttachmentFilesize) attributes.filesize = null
+        if (this.hideAttachmentUrl) attributes.href = null
+
         successCallback(attributes)
       }
     })

data/app/views/avo/actions/show.html.erb

@@ -7,7 +7,7 @@
     data-resource-id="<%= params[:id] %>"
     class="hidden text-blue-gray-800"
   >
-    <%= form_with model: @model, scope: 'fields', url: "#{Avo.configuration.root_path}/resources/#{@resource.model_class.model_name.route_key}/actions/#{@action.param_id}", data: {'turbo-frame': '_top', 'action-target': 'form'} do |form| %>
+    <%= form_with model: @model, scope: 'fields', url: "#{avo.root_path}resources/#{@resource.model_class.model_name.route_key}/actions/#{@action.param_id}", data: {'turbo-frame': '_top', 'action-target': 'form'} do |form| %>
       <%= render Avo::ModalComponent.new do |c| %>
         <% c.heading do %>
           <%= @action.action_name %>

data/app/views/avo/attachments/show.html.erb

@@ -1,5 +1,5 @@
 <%= turbo_frame_tag 'destroy_attachment_form' do %>
-  <%= form_with url: "#{Avo.configuration.root_path}/resources/#{params[:resource_name]}/#{params[:id]
+  <%= form_with url: "#{avo.root_path}resources/#{params[:resource_name]}/#{params[:id]
     }/active_storage_attachments/#{params[:attachment_name]}/#{params[:signed_attachment_id]}",
     method: :delete,
     html: {

data/app/views/avo/base/_actions.html.erb

@@ -15,8 +15,8 @@
       <%
         @actions.each_with_index do |action, index|
           path = action_name == 'show' ?
-            "#{Avo.configuration.root_path}/resources/#{@resource.model_class.model_name.route_key}/#{@model.id}/actions/#{action.param_id}" :
-            "#{Avo.configuration.root_path}/resources/#{@resource.model_class.model_name.route_key}/actions/#{action.param_id}"
+            "#{avo.root_path}resources/#{@resource.model_class.model_name.route_key}/#{@model.id}/actions/#{action.param_id}" :
+            "#{avo.root_path}resources/#{@resource.model_class.model_name.route_key}/actions/#{action.param_id}"
       %>
         <%= link_to path,
           'data-turbo-frame': 'actions_show',

data/app/views/avo/home/index.html.erb

@@ -28,8 +28,8 @@
               <li><span class="mr-2">👍</span> Authorization</li>
               <li><span class="mr-2">👍</span> Localization</li>
               <li><span class="mr-2">👍</span> Custom tools</li>
-              <li><span class="mr-2">⏳</span> Custom fields</li>
-              <li><span class="mr-2">⏳</span> Search</li>
+              <li><span class="mr-2">👍</span> Custom fields</li>
+              <li><span class="mr-2">👍</span> Search</li>
               <li><span class="mr-2">🕐</span> Dashboards</li>
               <li><span class="mr-2">🕐</span> Themes</li>
             </ul>