avo 1.7.2 → 1.8.2

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/actions_controller.rb

@@ -12,7 +12,7 @@ module Avo
 
     def handle
       resource_ids = action_params[:fields][:resource_ids].split(",").map(&:to_i)
-      models = @resource.model_class.find resource_ids
+      models = @resource.class.find_scope.find resource_ids
 
       fields = action_params[:fields].select do |key, value|
         key != "resource_ids"
@@ -33,7 +33,7 @@ module Avo
       action_class = params[:action_id].gsub("avo_actions_", "").classify.safe_constantize
 
       if params[:id].present?
-        model = @resource.model_class.find params[:id]
+        model = @resource.class.find_scope.find params[:id]
       end
 
       @action = action_class.new(model: model, resource: resource, user: _current_user)

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,11 +148,11 @@ module Avo
     end
 
     def set_model
-      @model = eager_load_files(@resource, @resource.model_class).find params[:id]
+      @model = eager_load_files(@resource, @resource.class.find_scope).find params[:id]
     end
 
     def set_related_model
-      @related_model = eager_load_files(@related_resource, @related_resource.model_class).find params[:related_id]
+      @related_model = eager_load_files(@related_resource, @related_resource.class.find_scope).find params[:related_id]
     end
 
     def hydrate_resource
@@ -179,7 +180,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 +274,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
@@ -18,7 +20,7 @@ module Avo
 
       # If we don't get a query object predefined from a child controller like relations, just spin one up
       unless defined? @query
-        @query = @authorization.apply_policy @resource.model_class
+        @query = @resource.class.query_scope
       end
 
       # Remove default_scope for index view
@@ -62,7 +64,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_model = via_resource.model_class.find params[:via_resource_id]
+        via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
         add_breadcrumb via_resource.plural_name, resources_path(via_resource.model_class)
@@ -91,7 +93,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_model = via_resource.model_class.find params[:via_resource_id]
+        via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
         add_breadcrumb via_resource.plural_name, resources_path(via_resource.model_class)
@@ -217,7 +219,12 @@ module Avo
       end
 
       # Sorting
-      @index_params[:sort_by] = params[:sort_by] || :created_at
+      if params[:sort_by].present?
+        @index_params[:sort_by] = params[:sort_by]
+      elsif @resource.model_class.present? && @resource.model_class.column_names.include?("created_at")
+        @index_params[:sort_by] = :created_at
+      end
+
       @index_params[:sort_direction] = params[:sort_direction] || :desc
 
       # View types
@@ -235,7 +242,7 @@ module Avo
 
     def set_actions
       if params[:resource_id].present?
-        model = @resource.model_class.find params[:resource_id]
+        model = @resource.class.find_scope.find params[:resource_id]
       end
 
       @actions = @resource.get_actions.map do |action|
@@ -260,5 +267,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/relations_controller.rb

@@ -15,7 +15,7 @@ module Avo
     def index
       @parent_resource = @resource.dup
       @resource = @related_resource
-      @parent_model = @parent_resource.model_class.find(params[:id])
+      @parent_model = @parent_resource.class.find_scope.find(params[:id])
       @parent_resource.hydrate(model: @parent_model)
       @query = @authorization.apply_policy @parent_model.public_send(params[:related_name])
 

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]
 
@@ -18,14 +20,15 @@ module Avo
     private
 
     def search_resources(resources)
-      resources.map do |resource|
-        # Apply authorization
-        next unless @authorization.set_record(resource.model_class).authorize_action(:index, raise_exception: false)
-        # Filter out the models without a search_query
-        next if resource.search_query.nil?
+      resources
+        .map do |resource|
+          # Apply authorization
+          next unless @authorization.set_record(resource.model_class).authorize_action(:index, raise_exception: false)
+          # Filter out the models without a search_query
+          next if resource.search_query.nil?
 
-        search_resource resource
-      end
+          search_resource resource
+        end
         .select do |payload|
           payload.present?
         end
@@ -61,7 +64,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/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>

data/app/views/avo/partials/_javascript.html.erb

@@ -1,5 +1,5 @@
 <%= javascript_tag nonce: true do %>
   window.Avo = window.Avo || { configuration: {} }
   Avo.configuration.timezone = '<%= Avo.configuration.timezone %>'
-  Avo.configuration.root_path = '<%= Avo.configuration.root_path %>'
+  Avo.configuration.root_path = '<%= Avo::App.root_path %>'
 <% end %>

data/app/views/avo/partials/_resource_search.html.erb

@@ -6,5 +6,5 @@
     data-debounce-timeout='<%= Avo.configuration.search_debounce %>'
   >
   </div>
-  <div class="relative inline-flex text-gray-400 text-sm border border-gray-300 rounded-full cursor-pointer" data-search-target="button"></div>
+  <div class="hidden relative inline-flex text-gray-400 text-sm border border-gray-300 rounded-full cursor-pointer" data-search-target="button"></div>
 </div>

data/app/views/avo/relations/new.html.erb

@@ -1,6 +1,6 @@
 <%= turbo_frame_tag 'attach_modal' do %>
   <%= form_with scope: 'fields',
-    url: "#{Avo.configuration.root_path}/resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/",
+    url: "#{avo.root_path}resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/",
     data: {
       'turbo-frame': '_top'
     } do |form| %>

data/app/views/avo/sidebar/_sidebar.html.erb

@@ -6,7 +6,7 @@
 
     <div class="flex-1 flex flex-col justify-between">
       <div class="tools py-4">
-        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: Avo.configuration.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil?  %>
+        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: avo.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil?  %>
 
         <%= render Avo::NavigationHeadingComponent.new label: t('avo.resources') %>
 

data/db/migrate/20210525143134_add_slug_to_users.rb

@@ -0,0 +1,6 @@
+class AddSlugToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :users, :slug, :string
+    add_index :users, :slug, unique: true
+  end
+end

data/lib/avo/app.rb

@@ -7,6 +7,7 @@ module Avo
     class_attribute :context, default: nil
     class_attribute :license, default: nil
     class_attribute :current_user, default: nil
+    class_attribute :root_path, default: nil
 
     class << self
       def boot
@@ -21,10 +22,11 @@ module Avo
         end
       end
 
-      def init(request:, context:, current_user:)
+      def init(request:, context:, current_user:, root_path:)
         self.request = request
         self.context = context
         self.current_user = current_user
+        self.root_path = root_path
 
         self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
 

data/lib/avo/base_resource.rb

@@ -23,6 +23,8 @@ module Avo
     class_attribute :grid_loader
     class_attribute :visible_on_sidebar, default: true
     class_attribute :unscoped_queries_on_index, default: false
+    class_attribute :resolve_query_scope
+    class_attribute :resolve_find_scope
 
     class << self
       def grid(&block)
@@ -44,8 +46,24 @@ module Avo
         self.filters_loader.use filter_class
       end
 
+      # This is the search_query scope
+      # This should be removed and passed to the search block
       def scope
-        authorization.apply_policy model_class
+        self.query_scope
+      end
+
+      # This resolves the scope when doing "where" queries (not find queries)
+      def query_scope
+        final_scope = resolve_query_scope.present? ? resolve_query_scope.call(model_class: model_class) : model_class
+
+        authorization.apply_policy final_scope
+      end
+
+      # This resolves the scope when finding records (not "where" queries)
+      def find_scope
+        final_scope = resolve_find_scope.present? ? resolve_find_scope.call(model_class: model_class) : model_class
+
+        authorization.apply_policy final_scope
       end
 
       def authorization
@@ -322,7 +340,7 @@ module Avo
     end
 
     def avo_path
-      "#{Avo.configuration.root_path}/resources/#{model_class.model_name.route_key}/#{model.id}"
+      "#{Avo::App.root_path}/resources/#{model_class.model_name.route_key}/#{model.id}"
     end
 
     def label_field
@@ -350,6 +368,8 @@ module Avo
     def avatar
       return avatar_field.to_image if avatar_field.respond_to? :to_image
 
+      return avatar_field.value.variant(resize_to_limit: [480, 480]) if avatar_field.type == "file"
+
       avatar_field.value
     rescue
       nil

data/lib/avo/configuration.rb

@@ -23,6 +23,7 @@ module Avo
     attr_accessor :initial_breadcrumbs
     attr_accessor :home_path
     attr_accessor :search_debounce
+    attr_accessor :view_component_path
 
     def initialize
       @root_path = "/avo"
@@ -58,6 +59,7 @@ module Avo
       @display_breadcrumbs = true
       @home_path = nil
       @search_debounce = 300
+      @view_component_path = "app/components"
     end
 
     def locale_tag
@@ -91,7 +93,7 @@ module Avo
     end
 
     def namespace
-      root_path.delete "/"
+      computed_root_path.delete "/"
     end
 
     def root_path
@@ -99,6 +101,10 @@ module Avo
 
       @root_path
     end
+
+    def computed_root_path
+      Avo::App.root_path
+    end
   end
 
   def self.configuration