avo 2.13.3.pre.3 → 2.13.5.pre.1

data/app/assets/svgs/heroicons/solid/user.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-  <path fill-rule="evenodd" d="M10 9a3 3 0 100-6 3 3 0 000 6zm-7 9a7 7 0 1114 0H3z" clip-rule="evenodd"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
+  <path fill-rule="evenodd" d="M7.5 6a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zM3.751 20.105a8.25 8.25 0 0116.498 0 .75.75 0 01-.437.695A18.683 18.683 0 0112 22.5c-2.786 0-5.433-.608-7.812-1.7a.75.75 0 01-.437-.695z" clip-rule="evenodd"/>
 </svg>

data/app/assets/svgs/heroicons/solid/users.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-  <path d="M9 6a3 3 0 11-6 0 3 3 0 016 0zM17 6a3 3 0 11-6 0 3 3 0 016 0zM12.93 17c.046-.327.07-.66.07-1a6.97 6.97 0 00-1.5-4.33A5 5 0 0119 16v1h-6.07zM6 11a5 5 0 015 5v1H1v-1a5 5 0 015-5z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
+  <path d="M4.5 6.375a4.125 4.125 0 118.25 0 4.125 4.125 0 01-8.25 0zM14.25 8.625a3.375 3.375 0 116.75 0 3.375 3.375 0 01-6.75 0zM1.5 19.125a7.125 7.125 0 0114.25 0v.003l-.001.119a.75.75 0 01-.363.63 13.067 13.067 0 01-6.761 1.873c-2.472 0-4.786-.684-6.76-1.873a.75.75 0 01-.364-.63l-.001-.122zM17.25 19.128l-.001.144a2.25 2.25 0 01-.233.96 10.088 10.088 0 005.06-1.01.75.75 0 00.42-.643 4.875 4.875 0 00-6.957-4.611 8.586 8.586 0 011.71 5.157v.003z"/>
 </svg>

data/app/assets/svgs/heroicons/solid/video-camera-slash.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
+  <path d="M3.53 2.47a.75.75 0 00-1.06 1.06l18 18a.75.75 0 101.06-1.06l-18-18zM22.5 17.69c0 .471-.202.86-.504 1.124l-4.746-4.746V7.939l2.69-2.689c.944-.945 2.56-.276 2.56 1.06v11.38zM15.75 7.5v5.068L7.682 4.5h5.068a3 3 0 013 3zM1.5 7.5c0-.782.3-1.494.79-2.028l12.846 12.846A2.995 2.995 0 0112.75 19.5H4.5a3 3 0 01-3-3v-9z"/>
+</svg>

data/app/assets/svgs/heroicons/solid/video-camera.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-  <path d="M2 6a2 2 0 012-2h6a2 2 0 012 2v8a2 2 0 01-2 2H4a2 2 0 01-2-2V6zM14.553 7.106A1 1 0 0014 8v4a1 1 0 00.553.894l2 1A1 1 0 0018 13V7a1 1 0 00-1.447-.894l-2 1z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
+  <path d="M4.5 4.5a3 3 0 00-3 3v9a3 3 0 003 3h8.25a3 3 0 003-3v-9a3 3 0 00-3-3H4.5zM19.94 18.75l-2.69-2.69V7.94l2.69-2.69c.944-.945 2.56-.276 2.56 1.06v11.38c0 1.336-1.616 2.005-2.56 1.06z"/>
 </svg>

data/app/assets/svgs/heroicons/solid/view-columns.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
+  <path d="M15 3.75H9v16.5h6V3.75zM16.5 20.25h3.375c1.035 0 1.875-.84 1.875-1.875V5.625c0-1.036-.84-1.875-1.875-1.875H16.5v16.5zM4.125 3.75H7.5v16.5H4.125a1.875 1.875 0 01-1.875-1.875V5.625c0-1.036.84-1.875 1.875-1.875z"/>
+</svg>

data/app/assets/svgs/heroicons/solid/wifi.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-  <path fill-rule="evenodd" d="M17.778 8.222c-4.296-4.296-11.26-4.296-15.556 0A1 1 0 01.808 6.808c5.076-5.077 13.308-5.077 18.384 0a1 1 0 01-1.414 1.414zM14.95 11.05a7 7 0 00-9.9 0 1 1 0 01-1.414-1.414 9 9 0 0112.728 0 1 1 0 01-1.414 1.414zM12.12 13.88a3 3 0 00-4.242 0 1 1 0 01-1.415-1.415 5 5 0 017.072 0 1 1 0 01-1.415 1.415zM9 16a1 1 0 011-1h.01a1 1 0 110 2H10a1 1 0 01-1-1z" clip-rule="evenodd"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
+  <path fill-rule="evenodd" d="M1.371 8.143c5.858-5.857 15.356-5.857 21.213 0a.75.75 0 010 1.061l-.53.53a.75.75 0 01-1.06 0c-4.98-4.979-13.053-4.979-18.032 0a.75.75 0 01-1.06 0l-.53-.53a.75.75 0 010-1.06zm3.182 3.182c4.1-4.1 10.749-4.1 14.85 0a.75.75 0 010 1.061l-.53.53a.75.75 0 01-1.062 0 8.25 8.25 0 00-11.667 0 .75.75 0 01-1.06 0l-.53-.53a.75.75 0 010-1.06zm3.204 3.182a6 6 0 018.486 0 .75.75 0 010 1.061l-.53.53a.75.75 0 01-1.061 0 3.75 3.75 0 00-5.304 0 .75.75 0 01-1.06 0l-.53-.53a.75.75 0 010-1.06zm3.182 3.182a1.5 1.5 0 012.122 0 .75.75 0 010 1.061l-.53.53a.75.75 0 01-1.061 0l-.53-.53a.75.75 0 010-1.06z" clip-rule="evenodd"/>
 </svg>

data/app/assets/svgs/heroicons/solid/wrench-screwdriver.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
+  <path fill-rule="evenodd" d="M12 6.75a5.25 5.25 0 016.775-5.025.75.75 0 01.313 1.248l-3.32 3.319c.063.475.276.934.641 1.299.365.365.824.578 1.3.64l3.318-3.319a.75.75 0 011.248.313 5.25 5.25 0 01-5.472 6.756c-1.018-.086-1.87.1-2.309.634L7.344 21.3A3.298 3.298 0 112.7 16.657l8.684-7.151c.533-.44.72-1.291.634-2.309A5.342 5.342 0 0112 6.75zM4.117 19.125a.75.75 0 01.75-.75h.008a.75.75 0 01.75.75v.008a.75.75 0 01-.75.75h-.008a.75.75 0 01-.75-.75v-.008z" clip-rule="evenodd"/>
+  <path d="M10.076 8.64l-2.201-2.2V4.874a.75.75 0 00-.364-.643l-3.75-2.25a.75.75 0 00-.916.113l-.75.75a.75.75 0 00-.113.916l2.25 3.75a.75.75 0 00.643.364h1.564l2.062 2.062 1.575-1.297z"/>
+  <path fill-rule="evenodd" d="M12.556 17.329l4.183 4.182a3.375 3.375 0 004.773-4.773l-3.306-3.305a6.803 6.803 0 01-1.53.043c-.394-.034-.682-.006-.867.042a.589.589 0 00-.167.063l-3.086 3.748zm3.414-1.36a.75.75 0 011.06 0l1.875 1.876a.75.75 0 11-1.06 1.06L15.97 17.03a.75.75 0 010-1.06z" clip-rule="evenodd"/>
+</svg>

data/app/assets/svgs/heroicons/solid/wrench.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
+  <path fill-rule="evenodd" d="M12 6.75a5.25 5.25 0 016.775-5.025.75.75 0 01.313 1.248l-3.32 3.319c.063.475.276.934.641 1.299.365.365.824.578 1.3.64l3.318-3.319a.75.75 0 011.248.313 5.25 5.25 0 01-5.472 6.756c-1.018-.086-1.87.1-2.309.634L7.344 21.3A3.298 3.298 0 112.7 16.657l8.684-7.151c.533-.44.72-1.291.634-2.309A5.342 5.342 0 0112 6.75zM4.117 19.125a.75.75 0 01.75-.75h.008a.75.75 0 01.75.75v.008a.75.75 0 01-.75.75h-.008a.75.75 0 01-.75-.75v-.008z" clip-rule="evenodd"/>
+</svg>

data/app/assets/svgs/heroicons/solid/x-circle.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-  <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
+  <path fill-rule="evenodd" d="M12 2.25c-5.385 0-9.75 4.365-9.75 9.75s4.365 9.75 9.75 9.75 9.75-4.365 9.75-9.75S17.385 2.25 12 2.25zm-1.72 6.97a.75.75 0 10-1.06 1.06L10.94 12l-1.72 1.72a.75.75 0 101.06 1.06L12 13.06l1.72 1.72a.75.75 0 101.06-1.06L13.06 12l1.72-1.72a.75.75 0 10-1.06-1.06L12 10.94l-1.72-1.72z" clip-rule="evenodd"/>
 </svg>

data/app/assets/svgs/heroicons/solid/x-mark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
+  <path fill-rule="evenodd" d="M3.97 3.97a.75.75 0 011.06 0L12 10.94l6.97-6.97a.75.75 0 111.06 1.06L13.06 12l6.97 6.97a.75.75 0 11-1.06 1.06L12 13.06l-6.97 6.97a.75.75 0 01-1.06-1.06L10.94 12 3.97 5.03a.75.75 0 010-1.06z" clip-rule="evenodd"/>
+</svg>

data/app/components/avo/base_component.rb

@@ -18,7 +18,8 @@ class Avo::BaseComponent < ViewComponent::Base
   end
 
   def relation_resource
-    ::Avo::App.get_resource_by_model_name params[:via_resource_class].safe_constantize
+    model = params[:via_resource_class] || params[:via_relation_class]
+    ::Avo::App.get_resource_by_model_name model.safe_constantize
   end
 
   # Get the resource for the resource using the klass attribute so we get the namespace too

data/app/components/avo/resource_component.rb

@@ -19,7 +19,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def can_detach?
-    authorize_association_for("detach")
+    authorize_association_for(:detach)
   end
 
   def detach_path
@@ -53,7 +53,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
     if @reflection.present?
       # Fetch the appropiate resource
-      reflection_resource = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name)
+      reflection_resource = field.resource
       # Fetch the model
       # Hydrate the resource with the model if we have one
       reflection_resource.hydrate(model: @parent_model) if @parent_model.present?
@@ -98,6 +98,6 @@ class Avo::ResourceComponent < Avo::BaseComponent
   private
 
   def via_resource?
-    params[:via_resource_class].present? && params[:via_resource_id].present?
+    (params[:via_resource_class].present? || params[:via_relation_class].present?) && params[:via_resource_id].present?
   end
 end

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

@@ -4,6 +4,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
+  attr_reader :resource
   attr_reader :view
 
   def initialize(resource: nil, model: nil, actions: [], view: :edit)
@@ -19,7 +20,8 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
 
   def back_path
     if via_resource?
-      helpers.resource_path(model: params[:via_resource_class].safe_constantize, resource: relation_resource, resource_id: params[:via_resource_id])
+      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

data/app/controllers/avo/team_users_controller.rb

@@ -0,0 +1,4 @@
+# This controller has been generated to enable Rails' resource routes.
+# You shouldn't need to modify it in order to use Avo.
+class Avo::TeamUsersController < Avo::ResourcesController
+end

data/app/helpers/avo/application_helper.rb

@@ -64,43 +64,15 @@ module Avo
       classes
     end
 
-    # Just use inline_svg gem.
+    # Use inline_svg gem but with our own finder implementation.
     def svg(file_name, **args)
+      return if file_name.blank?
+
       file_name = "#{file_name}.svg" unless file_name.end_with? ".svg"
 
-      inline_svg_tag file_name, **args
-      # return if file_name.nil?
-
-      # file_name = "#{file_name}.svg" unless file_name.end_with? ".svg"
-
-      # final_path = nil
-      # [Rails.root, Avo::Engine.root].each do |root|
-      #   [["app", "assets", "svgs", file_name], [file_name]].each do |file_path|
-      #     path = root.join(*file_path).to_s
-      #     puts ["path->", path].inspect
-      #     if File.exist? path
-      #       # final_path = file_path.join('/')
-      #       final_path = path
-      #       break
-      #     end
-      #   end
-      # end
-      # puts ["final_path->", final_path].inspect
-
-      # # paths = [
-      # #   Rails.root.join("app", "assets", "svgs", file_name).to_s,
-      # #   Rails.root.join(file_name).to_s,
-      # #   Avo::Engine.root.join("app", "assets", "svgs", file_name).to_s,
-      # #   Avo::Engine.root.join(file_name).to_s,
-      # # ]
-
-      # # path = paths.find do |path|
-      # #   File.exist? path
-      # # end
-
-      # return if final_path.nil?
-
-      # inline_svg_tag final_path, **args
+      with_asset_finder(::Avo::SvgFinder) do
+        inline_svg file_name, **args
+      end
     end
 
     def input_classes(extra_classes = "", has_error: false)
@@ -130,5 +102,17 @@ module Avo
     rescue
       Avo.configuration.root_path
     end
+
+    private
+
+    # Taken from the original library
+    # https://github.com/jamesmartin/inline_svg/blob/main/lib/inline_svg/action_view/helpers.rb#L76
+    def with_asset_finder(asset_finder)
+      Thread.current[:inline_svg_asset_finder] = asset_finder
+      output = yield
+      Thread.current[:inline_svg_asset_finder] = nil
+
+      output
+    end
   end
 end

data/app/views/layouts/avo/application.html.erb

@@ -33,7 +33,6 @@
             <div class="content p-4 lg:p-6 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
               <%= render partial: "avo/partials/custom_tools_alert" %>
               <div class="flex flex-1 flex-col justify-between items-stretch space-y-8">
-              <!-- <%= ::Rails.application.assets_manifest.inspect %> -->
                 <%= yield %>
                 <%= render partial: "avo/partials/footer" %>
               </div>

data/lib/avo/base_resource.rb

@@ -20,7 +20,6 @@ module Avo
     delegate :context, to: ::Avo::App
 
     attr_accessor :view
-    attr_accessor :model
     attr_accessor :reflection
     attr_accessor :user
     attr_accessor :params
@@ -111,6 +110,11 @@ module Avo
       end
     end
 
+    def record
+      @model
+    end
+    alias :model :record
+
     def hydrate(model: nil, view: nil, user: nil, params: nil)
       @view = view if view.present?
       @user = user if user.present?

data/lib/avo/concerns/fetches_things.rb

@@ -51,10 +51,15 @@ module Avo
         #
         # get_resource_by_name('User') => UserResource
         # get_resource_by_name(User) => UserResource
-        def get_resource_by_model_name(name)
+        def get_resource_by_model_name(klass)
+          # Fetch the mappings imposed by the user.
+          # If they are present, use those ones.
+          mapping = get_mapping_for_model klass
+          return get_resource(mapping) if mapping.present?
+
           valid_resources
             .find do |resource|
-              resource.model_class.model_name.name == name.to_s
+              resource.model_class.model_name.name == klass.to_s
             end
         end
 
@@ -128,6 +133,12 @@ module Avo
 
           get_sidebar_partials
         end
+
+        private
+
+        def get_mapping_for_model(klass)
+          (Avo.configuration.model_resource_mapping || {}).stringify_keys.transform_values(&:to_s)[klass.to_s]
+        end
       end
     end
   end

data/lib/avo/configuration.rb

@@ -34,6 +34,7 @@ module Avo
     attr_accessor :buttons_on_form_footers
     attr_accessor :main_menu
     attr_accessor :profile_menu
+    attr_accessor :model_resource_mapping
 
     def initialize
       @root_path = "/avo"
@@ -78,6 +79,7 @@ module Avo
       @buttons_on_form_footers = false
       @main_menu = nil
       @profile_menu = nil
+      @model_resource_mapping = {}
     end
 
     def current_user_method(&block)

data/lib/avo/engine.rb

@@ -53,9 +53,6 @@ module Avo
       # app.config.logger = ::Logger.new(STDOUT)
     end
 
-    # Add the outline heroicons to the path
-    config.assets.paths << Avo::Engine.root.join("app", "assets", "svgs", "heroicons", "outline")
-
     config.app_middleware.use(
       Rack::Static,
       urls: ["/avo-assets"],

data/lib/avo/svg_finder.rb

@@ -0,0 +1,45 @@
+class Avo::SvgFinder
+  def self.find_asset(filename)
+    new(filename)
+  end
+
+  def initialize(filename)
+    @filename = filename
+  end
+
+  # Use the default static finder logic. If that doesn't find anything, search according to our pattern:
+  def pathname
+    found_asset = default_strategy
+
+    # Use the found asset
+    return found_asset if found_asset.present?
+
+    paths = [
+      Rails.root.join("app", "assets", "svgs", @filename).to_s,
+      Rails.root.join(@filename).to_s,
+      Avo::Engine.root.join("app", "assets", "svgs", @filename).to_s,
+      Avo::Engine.root.join("app", "assets", "svgs", "heroicons", "outline", @filename).to_s,
+      Avo::Engine.root.join(@filename).to_s,
+    ]
+
+    path = paths.find do |path|
+      File.exist? path
+    end
+
+    path
+  end
+
+  def default_strategy
+    if ::Rails.application.config.assets.compile
+      asset = ::Rails.application.assets[@filename]
+      Pathname.new(asset.filename) if asset.present?
+    else
+      manifest = ::Rails.application.assets_manifest
+      asset_path = manifest.assets[@filename]
+      unless asset_path.nil?
+        ::Rails.root.join(manifest.directory, asset_path)
+      end
+    end
+  end
+end
+

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.13.3.pre.3" unless const_defined?(:VERSION)
+  VERSION = "2.13.5.pre.1" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/initializer/avo.tt

@@ -34,25 +34,27 @@ Avo.configure do |config|
   ## == Localization ==
   # config.locale = 'en-US'
 
+  ## == Resource options ==
+  # config.resource_controls = :right
+  # config.model_resource_mapping = {}
+  # config.default_view_type = :table
+  # config.per_page = 24
+  # config.per_page_steps = [12, 24, 48, 72]
+  # config.via_per_page = 8
+  # config.id_links_to_resource = false
+  # config.cache_resources_on_index_view = true
+
   ## == Customization ==
   # config.app_name = 'Avocadelicious'
   # config.timezone = 'UTC'
   # config.currency = 'USD'
-  # config.per_page = 24
-  # config.per_page_steps = [12, 24, 48, 72]
-  # config.via_per_page = 8
-  # config.default_view_type = :table
   # config.hide_layout_when_printing = false
-  # config.id_links_to_resource = false
   # config.full_width_container = false
   # config.full_width_index_view = false
-  # config.cache_resources_on_index_view = true
   # config.search_debounce = 300
   # config.view_component_path = "app/components"
   # config.display_license_request_timeout_error = true
   # config.disabled_features = []
-  # config.resource_controls = :right
-
 
   ## == Breadcrumbs ==
   # config.display_breadcrumbs = true