avo 2.6.1.pre.1 → 2.7.1.pre.1

data/app/assets/svgs/download-solid-reversed.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" transform="rotate(-180)">
-  <path fill-rule="evenodd" d="M3 17a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zm3.293-7.707a1 1 0 011.414 0L9 10.586V3a1 1 0 112 0v7.586l1.293-1.293a1 1 0 111.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
+<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+  <path fill-rule="evenodd" d="M3 17a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zm3.293-7.707a1 1 0 011.414 0L9 10.586V3a1 1 0 112 0v7.586l1.293-1.293a1 1 0 111.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" transform="rotate(-180 10 10)" />
 </svg>

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

@@ -1,3 +1,3 @@
-or<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
   <path d="M11 6a3 3 0 11-6 0 3 3 0 016 0zM14 17a6 6 0 00-12 0h12zM13 8a1 1 0 100 2h4a1 1 0 100-2h-4z"/>
 </svg>

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

@@ -9,6 +9,7 @@
     data-via-reflection-class="<%= @field.model.class.to_s %>"
     data-via-parent-resource-id="<%= params[:via_resource_id] %>"
     data-via-parent-resource-class="<%= params[:via_relation_class] %>"
+    data-via-relation="<%= params[:via_relation] %>"
   ></div>
   <div class="relative w-full" autocomplete="off">
     <%= @form.text_field @foreign_key,

data/app/components/avo/fields/has_one_field/show_component.html.erb

@@ -3,11 +3,11 @@
     <%= render(Avo::LoadingComponent.new(title: @field.name)) %>
   </turbo-frame>
 <% else %>
-  <%= render Avo::PanelComponent.new(title: @field.id.capitalize) do |c| %>
+  <%= render Avo::PanelComponent.new(title: @field.name) do |c| %>
     <% c.tools do %>
       <% if !@field.readonly && can_attach? %>
         <%= a_link attach_path, icon: 'heroicons/outline/link', color: :primary, 'data-turbo-frame': 'attach_modal' do %>
-          <%= t('avo.attach_item', item: @field.id).capitalize %>
+          <%= t('avo.attach_item', item: @field.name) %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field do %>
+<%= index_field_wrapper field: @field, flush: true do %>
   <div class="flex gap-1 items-center flex-nowrap">
     <% value.take(3).each do |item| %>
       <%= render Avo::Fields::TagsField::TagComponent.new(label: label_from_item(item)) %>

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

@@ -41,7 +41,8 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def edit_path
-    args = {}
+    #Add the `view` param to let Avo know where to redirect back when the user clicks the `Cancel` button.
+    args = {via_view: 'index'}
 
     if @parent_model.present?
       args = {

data/app/components/avo/resource_component.rb

@@ -1,4 +1,10 @@
 class Avo::ResourceComponent < Avo::BaseComponent
+  attr_reader :fields_by_panel
+  attr_reader :has_one_panels
+  attr_reader :has_many_panels
+  attr_reader :has_as_belongs_to_many_panels
+  attr_reader :resource_tools
+
   def can_create?
     return authorize_association_for(:create) if @reflection.present?
 
@@ -75,6 +81,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
     @has_one_panels = []
     @has_many_panels = []
     @has_as_belongs_to_many_panels = []
+    @resource_tools = @resource.tools
   end
 
   def via_resource?

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

@@ -64,5 +64,10 @@
         <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
       <% end %>
     <% end %>
+    <% if resource_tools.present? %>
+      <% resource_tools.each do |tool, index| %>
+        <%= render tool.partial, tool: tool %>
+      <% end %>
+    <% end %>
   <% end %>
 </div>

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

@@ -4,8 +4,6 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
-  attr_reader :fields_by_panel, :has_one_panels, :has_many_panels, :has_as_belongs_to_many_panels
-
   def initialize(resource: nil)
     @resource = resource
 
@@ -15,7 +13,9 @@ 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])
-    else
+    elsif via_index?
+      helpers.resources_path(resource: @resource)
+    else # via resource show page
       helpers.resource_path(model: @resource.model, resource: @resource)
     end
   end
@@ -25,4 +25,10 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   def can_see_the_save_button?
     @resource.authorization.authorize_action :edit, raise_exception: false
   end
+
+  private
+
+  def via_index?
+    params[:via_view] == 'index'
+  end
 end

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

@@ -15,9 +15,9 @@
                 form_class: 'flex flex-col sm:flex-row sm:inline-flex',
                 style: :text,
                 data: {
-                  confirm: "Are you sure you want to detach this #{@reflection.name.to_s}."
+                  confirm: "Are you sure you want to detach this #{title}."
                 } do %>
-                <%= t('avo.detach_item', item: @reflection.name.to_s).capitalize %>
+                <%= t('avo.detach_item', item: title).capitalize %>
               <% end %>
               <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource %>
             <% end %>
@@ -93,6 +93,11 @@
         <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
       <% end %>
     <% end %>
+    <% if resource_tools.present? %>
+      <% resource_tools.each do |tool, index| %>
+        <%= render tool.partial, tool: tool %>
+      <% end %>
+    <% end %>
   <% end %>
 
   <% if should_display_invalid_fields_errors? %>

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

@@ -4,8 +4,6 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
-  attr_reader :fields_by_panel, :has_one_panels, :has_many_panels, :has_as_belongs_to_many_panels
-
   def initialize(resource: nil, reflection: nil, parent_model: nil, resource_panel: nil, actions: [])
     @resource = resource
     @reflection = reflection
@@ -17,6 +15,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
 
   def title
     if @reflection.present?
+      return field.name if has_one_field?
       reflection_resource.name
     else
       @resource.panels.first[:name]
@@ -50,4 +49,8 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   def should_display_invalid_fields_errors?
     (Rails.env.development? || Rails.env.test?) && @resource.invalid_fields.present?
   end
+
+  def has_one_field?
+    field.present? and field.class == Avo::Fields::HasOneField
+  end
 end

data/app/controllers/avo/cards_controller.rb

@@ -0,0 +1,25 @@
+require_dependency "avo/application_controller"
+
+module Avo
+  class CardsController < ApplicationController
+    before_action :set_dashboard, only: :show
+    before_action :set_card, only: :show
+
+    def show
+    end
+
+    private
+
+    def set_dashboard
+      @dashboard = Avo::App.get_dashboard_by_id params[:dashboard_id]
+
+      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
+    end
+
+    def set_card
+      @card = @dashboard.item_at_index(params[:index].to_i).tap do |card|
+        card.hydrate(dashboard: @dashboard, params: params)
+      end
+    end
+  end
+end

data/app/controllers/avo/dashboards_controller.rb

@@ -2,21 +2,15 @@ require_dependency "avo/application_controller"
 
 module Avo
   class DashboardsController < ApplicationController
-    before_action :set_dashboard
+    before_action :set_dashboard, only: :show
 
     def show
     end
 
-    def card
-      @card = @dashboard.item_at_index(params[:index].to_i).tap do |card|
-        card.hydrate(dashboard: @dashboard, params: params)
-      end
-    end
-
     private
 
     def set_dashboard
-      @dashboard = Avo::App.get_dashboard_by_id params[:dashboard_id]
+      @dashboard = Avo::App.get_dashboard_by_id params[:id]
 
       raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
     end

data/app/controllers/avo/home_controller.rb

@@ -4,7 +4,14 @@ module Avo
   class HomeController < ApplicationController
     def index
       if Avo.configuration.home_path.present?
-        redirect_to Avo.configuration.home_path
+        # If the home_path is a block run it, if not, just use it
+        computed_path = if Avo.configuration.home_path.respond_to? :call
+          instance_exec(&Avo.configuration.home_path)
+        else
+          Avo.configuration.home_path
+        end
+
+        redirect_to computed_path
       elsif !Rails.env.development?
         @page_title = "Get started"
         resource = Avo::App.resources.min_by { |resource| resource.model_key }

data/app/controllers/avo/search_controller.rb

@@ -46,26 +46,8 @@ module Avo
     def search_resource(resource)
       query = resource.search_query.call(params: params).limit(8)
 
-      # Figure oute if this is a belongs_to search
-      if params[:via_reflection_class].present?
-        # Fetch the field
-        field = belongs_to_field
-
-        if field.attach_scope.present?
-          # Try to fetch the parent.
-          if params[:via_reflection_id].present?
-            parent = params[:via_reflection_class].safe_constantize.find params[:via_reflection_id]
-          end
-
-          # Try to fetch the grandparent for the new views where the parent is nil.
-          if params[:via_parent_resource_id].present? && params[:via_parent_resource_class].present?
-            grandparent = params[:via_parent_resource_class].safe_constantize.find params[:via_parent_resource_id]
-          end
-
-          # Add to the query
-          query = Avo::Hosts::AssociationScopeHost.new(block: belongs_to_field.attach_scope, query: query, parent: parent, grandparent: grandparent).handle
-        end
-      end
+      # Figure out if this is a belongs_to search
+      query = apply_attach_scope query
 
       results = apply_search_metadata(query, resource)
 
@@ -79,6 +61,37 @@ module Avo
       [resource.name.pluralize.downcase, result_object]
     end
 
+    # Figure out if it's a belongs to search and if it has the attach_scope block present.
+    # If so, set the parent for those edit view and the parent with the grandparent for the new view.
+    def apply_attach_scope(query)
+      return query if params[:via_reflection_class].blank?
+
+      # Fetch the field
+      field = belongs_to_field
+
+      # No need to modify the query if there's no attach_scope present.
+      return query if field.attach_scope.blank?
+
+      # Try to fetch the parent.
+      if params[:via_reflection_id].present?
+        parent = params[:via_reflection_class].safe_constantize.find params[:via_reflection_id]
+      end
+
+      # If the parent is nil it probably means that someone's creating the record so it's not attached yet.
+      # In these scenarios, try to find the grandparent for the new views where the parent is nil
+      # and initialize the parent record with the grandparent attached so the user has the required information
+      # to scope the query.
+      if parent.blank? && params[:via_parent_resource_id].present? && params[:via_parent_resource_class].present? && params[:via_relation].present?
+        grandparent = params[:via_parent_resource_class].safe_constantize.find params[:via_parent_resource_id]
+        parent = params[:via_reflection_class].safe_constantize.new(
+          params[:via_relation] => grandparent
+        )
+      end
+
+      # Add to the query
+      Avo::Hosts::AssociationScopeHost.new(block: belongs_to_field.attach_scope, query: query, parent: parent).handle
+    end
+
     def apply_search_metadata(models, avo_resource)
       models.map do |model|
         resource = avo_resource.dup.hydrate(model: model).hydrate_fields(model: model)

data/app/javascript/js/controllers/search_controller.js

@@ -80,6 +80,8 @@ export default class extends Controller {
         via_parent_resource_id: this.dataset.viaParentResourceId,
         // eslint-disable-next-line camelcase
         via_parent_resource_class: this.dataset.viaParentResourceClass,
+        // eslint-disable-next-line camelcase
+        via_relation: this.dataset.viaRelation,
       }
     }
 

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

@@ -1,6 +1,17 @@
-<div class="w-full inset-auto bottom-0 z-50 mb-4 opacity-75 hover:opacity-100 transition-opacity duration-150">
-  <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-orange-700 text-white py-2 px-4 text-sm block items-center flex leading-tight">
-    <%= svg "exclamation", class: "h-6 inline mr-2 text-bold flex-shrink-0 mr-1" %> Warning. <%= @custom_tools_alert_visible %> This page will not be visible in a production environment.
-  </a>
-</div>
+<% if @custom_tools_alert_visible %>
+  <div class="w-full inset-auto bottom-0 z-50 mb-4 opacity-75 hover:opacity-100 transition-opacity duration-150">
+    <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-orange-700 text-white py-2 px-4 text-sm block items-center flex leading-tight">
+      <%= svg "exclamation", class: "h-6 inline mr-2 text-bold flex-shrink-0 mr-1" %> Warning. <%= @custom_tools_alert_visible %> This page will not be visible in a production environment.
+    </a>
+  </div>
+<% end %>
 
+<% if Avo::App.error_messages.present? %>
+  <% Avo::App.error_messages.each do |message| %>
+    <div class="w-full inset-auto bottom-0 z-50 mb-4 opacity-75 hover:opacity-100 transition-opacity duration-150">
+      <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-orange-700 text-white py-2 px-4 text-sm block items-center flex leading-tight">
+        <%= svg "exclamation", class: "h-6 inline mr-2 text-bold flex-shrink-0 mr-1" %> <%= message %>
+      </a>
+    </div>
+  <% end %>
+<% end %>

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

@@ -26,7 +26,7 @@
           <%= render Avo::SidebarComponent.new %>
           <div class="lg:pl-64 flex-1 flex flex-col min-h-full max-w-full">
             <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" if @custom_tools_alert_visible %>
+              <%= render partial: "avo/partials/custom_tools_alert" %>
               <div class="flex flex-1 flex-col justify-between items-stretch space-y-8">
                 <%= yield %>
                 <%= render partial: "avo/partials/footer" %>

data/config/routes.rb

@@ -1,11 +1,14 @@
 Avo::Engine.routes.draw do
   root "home#index"
 
-  get "resources", to: redirect("/admin")
+  get "resources", to: redirect(Avo.configuration.root_path)
+  get "dashboards", to: redirect(Avo.configuration.root_path)
+
   post "/rails/active_storage/direct_uploads", to: "/active_storage/direct_uploads#create"
 
-  get "/dashboards/:dashboard_id", to: "dashboards#show"
-  get "/dashboards/:dashboard_id/cards/:card_id", to: "dashboards#card"
+  resources :dashboards do
+    resources :cards
+  end
 
   scope "avo_api", as: "avo_api" do
     get "/search", to: "search#index"

data/lib/avo/app.rb

@@ -14,6 +14,7 @@ module Avo
     class_attribute :view_context, default: nil
     class_attribute :params, default: {}
     class_attribute :translation_enabled, default: false
+    class_attribute :error_messages, default: []
 
     class << self
       def boot
@@ -29,6 +30,7 @@ module Avo
       end
 
       def init(request:, context:, current_user:, root_path:, view_context:, params:)
+        self.error_messages = []
         self.request = request
         self.context = context
         self.current_user = current_user

data/lib/avo/base_resource.rb

@@ -5,6 +5,7 @@ module Avo
     extend HasContext
 
     include ActionView::Helpers::UrlHelper
+    include Avo::Concerns::HasTools
 
     delegate :view_context, to: "Avo::App"
     delegate :main_app, to: :view_context

data/lib/avo/base_resource_tool.rb

@@ -0,0 +1,34 @@
+module Avo
+  class BaseResourceTool
+    include Avo::Fields::FieldExtensions::VisibleInDifferentViews
+
+    class_attribute :name
+    class_attribute :partial
+
+    attr_accessor :params
+    attr_accessor :resource
+    attr_accessor :view
+
+    def initialize(**args)
+      # Set the visibility
+      show_on :show
+
+      show_on args[:show_on] if args[:show_on].present?
+      hide_on args[:hide_on] if args[:hide_on].present?
+      only_on args[:only_on] if args[:only_on].present?
+      except_on args[:except_on] if args[:except_on].present?
+    end
+
+    def hydrate(view: nil)
+      @view = view
+
+      self
+    end
+
+    def partial
+      return self.class.partial if self.class.partial.present?
+
+      "avo/resource_tools/#{self.class.to_s.underscore}"
+    end
+  end
+end

data/lib/avo/concerns/has_tools.rb

@@ -0,0 +1,47 @@
+module Avo
+  module Concerns
+    module HasTools
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :tools_holder
+
+        def tools
+          check_license
+
+          return [] if App.license.lacks_with_trial :resource_tools
+          return [] if self.class.tools.blank?
+
+          self.class.tools
+            .map do |tool|
+              tool.hydrate view: view
+            end
+            .select do |field|
+              field.send("show_on_#{view}")
+            end
+        end
+      end
+
+      class_methods do
+        def tool(klass, **args)
+          self.tools_holder ||= []
+
+          self.tools_holder << klass.new(**args)
+        end
+
+        def tools
+          self.tools_holder
+        end
+      end
+
+      private
+
+      def check_license
+        if !Rails.env.production? && App.license.lacks(:resource_tools)
+          # Add error message to let the developer know the resource tool will not be available in a production environment.
+          Avo::App.error_messages.push "Warning: Your license is invalid or doesn't support resource tools. The resource tools will not be visible in a production environment."
+        end
+      end
+    end
+  end
+end

data/lib/avo/engine.rb

@@ -26,7 +26,8 @@ module Avo
         ["app", "avo", "actions"],
         ["app", "avo", "resources"],
         ["app", "avo", "dashboards"],
-        ["app", "avo", "cards"]
+        ["app", "avo", "cards"],
+        ["app", "avo", "resource_tools"]
       ].each do |path_params|
         path = Rails.root.join(*path_params)
 

data/lib/avo/hosts/association_scope_host.rb

@@ -2,7 +2,6 @@ module Avo
   module Hosts
     class AssociationScopeHost < BaseHost
       option :parent
-      option :grandparent
       option :query
     end
   end

data/lib/avo/licensing/pro_license.rb

@@ -7,6 +7,7 @@ module Avo
           :localization,
           :custom_tools,
           :custom_fields,
+          :resource_tools,
           :global_search,
           :enhanced_search_results,
           :searchable_associations,

data/lib/avo/version.rb

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

data/lib/generators/avo/install_generator.rb

@@ -14,6 +14,9 @@ module Generators
 
         template "initializer/avo.tt", "config/initializers/avo.rb"
         template "locales/avo.en.yml", "config/locales/avo.en.yml"
+        template "locales/avo.nb-NO.yml", "config/locales/avo.nb-NO.yml"
+        template "locales/avo.pt-BR.yml", "config/locales/avo.pt-BR.yml"
+        template "locales/avo.ro.yml", "config/locales/avo.ro.yml"
       end
     end
   end

data/lib/generators/avo/resource_tool_generator.rb

@@ -0,0 +1,40 @@
+require "rails/generators"
+require "fileutils"
+
+module Generators
+  module Avo
+    class ResourceToolGenerator < ::Rails::Generators::NamedBase
+      argument :name, type: :string, required: true
+
+      source_root File.expand_path("templates", __dir__)
+
+      namespace "avo:resource_tool"
+
+      def handle
+        # Add configuration file
+        template "resource_tools/resource_tool.tt", "app/avo/resource_tools/#{file_name}.rb"
+
+        # Add view file
+        template "resource_tools/partial.tt", "app/views/avo/resource_tools/_#{file_name}.html.erb"
+      end
+
+      no_tasks do
+        def file_name
+          name.to_s.underscore
+        end
+
+        def controller_name
+          file_name.to_s
+        end
+
+        def human_name
+          file_name.humanize
+        end
+
+        def in_code(text)
+          "<code class='p-1 rounded bg-gray-500 text-white text-sm'>#{text}</code>"
+        end
+      end
+    end
+  end
+end

data/lib/generators/avo/templates/resource_tools/partial.tt

@@ -0,0 +1,37 @@
+<div class="flex flex-col">
+  <%%= render Avo::PanelComponent.new title: "<%= human_name %>" do |c| %>
+    <%% c.tools do %>
+      <%%= a_link('/avo', icon: 'heroicons/solid/academic-cap', style: :primary) do %>
+        Dummy link
+      <%% end %>
+    <%% end %>
+
+    <%% c.body do %>
+      <div class="flex flex-col p-4 min-h-24">
+        <div class="space-y-4">
+          <h3>🪧 This partial is waiting to be updated</h3>
+
+          <p>
+            You can edit this file here <%= in_code "app/views/avo/resource_tools/#{file_name}.html.erb" %>.
+          </p>
+
+          <p>
+            The resource tool configuration file should be here <%= in_code "app/avo/resource_tools/#{file_name}.rb" %>.
+          </p>
+
+          <%%
+            # In this partial you have access to the following variables:
+            # tool
+            # @resource
+            # @resource.model
+            # params
+            # Avo::App.context
+            # current_user
+          %>
+        </div>
+      </div>
+    <%% end %>
+  <%% end %>
+</div>
+
+

data/lib/generators/avo/templates/resource_tools/resource_tool.tt

@@ -0,0 +1,4 @@
+class <%= class_name %> < Avo::BaseResourceTool
+  self.name = "<%= human_name %>"
+  # self.partial = "avo/resource_tools/<%= file_name %>"
+end