avo 3.0.1.beta6 → 3.0.1.beta8

data/app/components/avo/fields/common/progress_bar_component.rb

@@ -7,19 +7,13 @@ class Avo::Fields::Common::ProgressBarComponent < ViewComponent::Base
   attr_reader :max
   attr_reader :view
 
-  def initialize(value:, display_value: false, value_suffix: nil, max: 100, view: :index)
+  def initialize(value:, display_value: false, value_suffix: nil, max: 100, view: "index")
     @value = value
     @display_value = display_value
     @value_suffix = value_suffix
     @max = max
-    @view = view
+    @view = Avo::ViewInquirer.new(view)
   end
 
-  def show?
-    view == :show
-  end
-
-  def index?
-    view == :index
-  end
+  delegate :show?, :index?, to: :view
 end

data/app/components/avo/fields/edit_component.rb

@@ -20,7 +20,7 @@ class Avo::Fields::EditComponent < ViewComponent::Base
     @multiple = multiple
     @resource = resource
     @stacked = stacked
-    @view = :edit
+    @view = Avo::ViewInquirer.new("edit")
   end
 
   def classes(extra_classes = "")

data/app/components/avo/fields/index_component.rb

@@ -13,7 +13,7 @@ class Avo::Fields::IndexComponent < Avo::BaseComponent
     @index = index
     @parent_record = parent_record
     @parent_resource = parent_resource
-    @view = :index
+    @view = Avo::ViewInquirer.new("index")
     @reflection = reflection
   end
 

data/app/components/avo/fields/show_component.rb

@@ -18,7 +18,7 @@ class Avo::Fields::ShowComponent < ViewComponent::Base
     @resource = resource
     @stacked = stacked
     @short = short
-    @view = :show
+    @view = Avo::ViewInquirer.new("show")
   end
 
   def wrapper_data

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

@@ -11,7 +11,7 @@ class Avo::Index::FieldWrapperComponent < ViewComponent::Base
     @classes = args[:class].present? ? args[:class] : ""
     @args = args
     @flush = flush
-    @view = :index
+    @view = Avo::ViewInquirer.new("index")
   end
 
   def classes

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

@@ -23,7 +23,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def can_view?
-    return false if Avo.configuration.resource_default_view == :edit
+    return false if Avo.configuration.resource_default_view.edit?
 
     return authorize_association_for(:show) if @reflection.present?
 

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

@@ -17,14 +17,14 @@ class Avo::Index::ResourceTableComponent < ViewComponent::Base
 
   def encrypted_query
     # TODO: move this to the resource where we can apply the adapter pattern
-    serialized_query = if Module.const_defined?("Ransack::Search") && query.instance_of?(Ransack::Search)
-      query.context.object.to_sql
-    else
-      return :select_all_disabled if query.nil? || !query.respond_to?(:all) || !query.all.respond_to?(:to_sql)
-
-      query.all.to_sql
+    if Module.const_defined?("Ransack::Search") && query.instance_of?(Ransack::Search)
+      @query = query.result
     end
 
+    return :select_all_disabled if query.nil? || !query.respond_to?(:all) || !query.all.respond_to?(:to_sql)
+
+    serialized_query = query.all.to_sql
+
     return if serialized_query.nil?
 
     Avo::Services::EncryptionService.encrypt(

data/app/components/avo/resource_component.rb

@@ -53,11 +53,16 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def destroy_path
-    if params[:via_resource_class].present?
-      helpers.resource_path(record: @resource.record, resource: @resource, referrer: back_path)
-    else
-      helpers.resource_path(record: @resource.record, resource: @resource)
+    args = {record: @resource.record, resource: @resource}
+
+    args[:referrer] = if params[:via_resource_class].present?
+      back_path
+    # If we're deleting a resource from a parent resource, we need to go back to the parent resource page after the deletion
+    elsif @parent_resource.present?
+      helpers.resource_path(record: @parent_record, resource: @parent_resource)
     end
+
+    helpers.resource_path(**args)
   end
 
   # Ex: A Post has many Comments

data/app/components/avo/sidebar_profile_component.html.erb

@@ -1,12 +1,12 @@
 <div class="text-black border-gray-150 p-4 flex border-t">
-  <div class="flex-1 flex space-x-4">
+  <div class="flex-1 flex space-x-4 w-full">
     <% if avatar.present? %>
-      <div class="relative aspect-square w-10 h-10 overflow-hidden rounded">
+      <div class="relative aspect-square w-10 h-10 overflow-hidden rounded shrink-0">
         <%= image_tag avatar, class: "object-cover min-w-full min-h-full h-full" %>
       </div>
     <% end %>
-    <div class="flex flex-col">
-      <div class="font-medium">
+    <div class="flex flex-col pr-3 min-w-0">
+      <div class="font-medium text-ellipsis overflow-hidden">
         <%= name %>
       </div>
       <% if title.present? %>

data/app/components/avo/tab_group_component.html.erb

@@ -25,7 +25,7 @@
       # On edit screens we want to load each tab because we wnst the DOM to have the fields present on form submission.
       # If you have a field which is in the second tab and it's required, the form submission will fail because the required field is not in view, and we don't want that.
       # We also want to load the current tab
-      should_lazy_load = if @view.to_s.in?(['edit', 'new', 'update', 'create'])
+      should_lazy_load = if @view.in?(%w[edit new update create])
         false
       else
         !is_current_tab

data/app/components/avo/tab_switcher_component.rb

@@ -33,11 +33,11 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent
   end
 
   def is_edit?
-    @view.in?([:edit, :update])
+    @view.in?(%w[edit update])
   end
 
   def is_new?
-    @view.in?([:new, :create])
+    @view.in?(%w[new create])
   end
 
   def is_initial_load?

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

@@ -3,11 +3,11 @@
 class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   include Avo::ApplicationHelper
 
-  def initialize(resource: nil, record: nil, actions: [], view: :edit)
+  def initialize(resource: nil, record: nil, actions: [], view: "edit")
     @resource = resource
     @record = record
     @actions = actions
-    @view = view
+    @view = Avo::ViewInquirer.new(view)
   end
 
   def title
@@ -18,7 +18,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     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
+    if is_edit? && Avo.configuration.resource_default_view.show? # via resource show or edit page
       return helpers.resource_path(record: @resource.record, resource: @resource)
     end
 
@@ -34,7 +34,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   end
 
   def can_see_the_destroy_button?
-    return super if is_edit? && Avo.configuration.resource_default_view == :edit
+    return super if is_edit? && Avo.configuration.resource_default_view.edit?
 
     false
   end
@@ -52,7 +52,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   end
 
   def is_edit?
-    view.in?([:edit, :update])
+    view.in?(%w[edit update])
   end
 
   def form_method

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

@@ -34,7 +34,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @parent_record = parent_record
     @parent_resource = parent_resource
     @applied_filters = applied_filters
-    @view = :index
+    @view = Avo::ViewInquirer.new("index")
     @query = query
     @scopes = scopes
   end

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

@@ -10,7 +10,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
     @actions = actions
     @parent_record = parent_record
     @parent_resource = parent_resource
-    @view = :show
+    @view = Avo::ViewInquirer.new("show")
   end
 
   def title

data/app/controllers/avo/actions_controller.rb

@@ -13,7 +13,7 @@ module Avo
 
     def show
       # Se the view to :new so the default value gets prefilled
-      @view = :new
+      @view = Avo::ViewInquirer.new("new")
 
       @resource.hydrate(record: @record, view: @view, user: _current_user, params: params)
       @record = ActionModel.new @action.get_attributes_for_action

data/app/controllers/avo/application_controller.rb

@@ -115,7 +115,7 @@ module Avo
     def set_resource
       raise ActionController::RoutingError.new "No route matches" if resource.nil?
 
-      @resource = resource.new(view: action_name.to_sym, user: _current_user, params: params)
+      @resource = resource.new(view: action_name.to_s, user: _current_user, params: params)
 
       set_authorization
     end
@@ -149,12 +149,12 @@ module Avo
     end
 
     def set_view
-      @view = action_name.to_sym
+      @view = Avo::ViewInquirer.new(action_name.to_s)
     end
 
     def set_record_to_fill
-      @record_to_fill = @resource.model_class.new if @view == :create
-      @record_to_fill = @record if @view == :update
+      @record_to_fill = @resource.model_class.new if @view.create?
+      @record_to_fill = @record if @view.update?
 
       # If resource.record is nil, most likely the user is creating a new record.
       # In that case, to access resource.record in visible and readonly blocks we hydrate the resource with a new record.
@@ -167,7 +167,7 @@ module Avo
       return if is_attach_action?
 
       @record = @resource.fill_record(@record_to_fill, cast_nullable(model_params), extra_params: extra_params)
-      assign_default_value_to_disabled_fields if @view == :create
+      assign_default_value_to_disabled_fields if @view.create?
     end
 
     def is_attach_action?

data/app/controllers/avo/base_controller.rb

@@ -529,7 +529,7 @@ module Avo
 
       if @resource.class.send(action) == :index
         resources_path(resource: @resource)
-      elsif @resource.class.send(action) == :edit || Avo.configuration.resource_default_view == :edit
+      elsif @resource.class.send(action) == :edit || Avo.configuration.resource_default_view.edit?
         edit_resource_path(resource: @resource, record: @resource.record)
       else
         resource_path(record: @record, resource: @resource)

data/app/controllers/avo/search_controller.rb

@@ -9,6 +9,8 @@ module Avo
 
     def show
       render json: search_resources([resource])
+    rescue => error
+      render_search_error(error)
     end
 
     private
@@ -164,5 +166,20 @@ module Avo
       parent_resource = Avo.resource_manager.get_resource_by_model_class params[:via_reflection_class]
       parent_resource.find_record params[:via_reflection_id], params: params
     end
+
+    def render_search_error(error)
+      raise error unless Rails.env.development?
+
+      render json: {
+        error: {
+          header: "🚨 An error occurred while searching. 🚨",
+          help: "Please see the error and fix it before deploying.",
+          results: {
+            _label: error.message
+          },
+          count: 1
+        }
+      }, status: 500
+    end
   end
 end

data/app/controllers/concerns/avo/initializes_avo.rb

@@ -7,6 +7,7 @@ module Avo
       Avo::Current.view_context = view_context
       Avo.init
       Avo::Current.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
+      Avo::Current.locale = locale
       Avo.plugin_manager.init_plugins
     end
 

data/app/helpers/avo/url_helpers.rb

@@ -94,7 +94,7 @@ module Avo
     end
 
     def resource_view_path(**args)
-      if Avo.configuration.resource_default_view == :edit
+      if Avo.configuration.resource_default_view.edit?
         edit_resource_path(**args)
       else
         resource_path(**args)

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

@@ -21,7 +21,7 @@
         <%= @action.get_message %>
       </div>
       <%= hidden_field_tag :action_id, @action.param_id %>
-      <%= form.hidden_field :avo_resource_ids, value: params[:resource_ids], 'data-action-target': 'resourceIds' %>
+      <%= form.hidden_field :avo_resource_ids, value: params[:id] || params[:resource_ids], 'data-action-target': 'resourceIds' %>
       <%= form.hidden_field :avo_selected_query, 'data-action-target': 'selectedAllQuery' %>
       <%= form.hidden_field :arguments, value: params[:arguments] %>
       <% if @action.get_fields.present? %>

data/config/routes.rb

@@ -4,9 +4,10 @@ Avo::Engine.routes.draw do
   get "resources", to: redirect(Avo.configuration.root_path)
   get "dashboards", to: redirect(Avo.configuration.root_path)
 
-  mount Avo::DynamicFilters::Engine, at: "/avo-dynamic_filters" if defined?(Avo::DynamicFilters::Engine)
-  mount Avo::Dashboards::Engine, at: "/dashboards" if defined?(Avo::Dashboards::Engine)
-  mount Avo::Pro::Engine, at: "/avo/avo-pro" if defined?(Avo::Pro::Engine)
+  # Mount Avo engines routes by default but leave it configurable in case the user wants to nest these under a scope.
+  if Avo.configuration.mount_avo_engines
+    instance_exec(&Avo.mount_engines)
+  end
 
   post "/rails/active_storage/direct_uploads", to: "/active_storage/direct_uploads#create"
 

data/db/factories.rb

@@ -38,7 +38,7 @@ FactoryBot.define do
   factory :project do
     name { Faker::App.name }
     status { ['closed', :rejected, :failed, 'loading', :running, :waiting].sample }
-    stage { ["Discovery", "Idea", "Done", "On hold", "Cancelled"].sample }
+    stage { ["Discovery", "Idea", "Done", "On hold", "Cancelled", "Drafting"].sample }
     budget { Faker::Number.decimal(l_digits: 4) }
     country { Faker::Address.country_code }
     description { Faker::Markdown.sandwich(sentences: 5) }

data/lib/avo/base_action.rb

@@ -65,7 +65,7 @@ module Avo
       self.class.record = record
       self.class.resource = resource
       self.class.user = user
-      self.class.view = view
+      self.class.view = Avo::ViewInquirer.new(view)
       @arguments = arguments
 
       self.class.message ||= I18n.t("avo.are_you_sure_you_want_to_run_this_option")
@@ -141,7 +141,7 @@ module Avo
     def visible_in_view(parent_resource: nil)
       if visible.blank?
         # Hide on the :new view by default
-        return false if view == :new
+        return false if view.new?
 
         # Show on all other views
         return true

data/lib/avo/base_resource.rb

@@ -9,6 +9,7 @@ module Avo
     include Avo::Concerns::HasStimulusControllers
     include Avo::Concerns::ModelClassConstantized
     include Avo::Concerns::HasDescription
+    include Avo::Concerns::HasHelpers
 
     # Avo::Current methods
     delegate :context, to: Avo::Current
@@ -233,14 +234,14 @@ module Avo
     delegate :model_key, to: :class
 
     def initialize(record: nil, view: nil, user: nil, params: nil)
-      @view = view if view.present?
+      @view = Avo::ViewInquirer.new(view) if view.present?
       @user = user if user.present?
       @params = params if params.present?
 
       if record.present?
         @record = record
 
-        hydrate_model_with_default_values if @view == :new
+        hydrate_model_with_default_values if @view&.new?
       end
 
       detect_fields
@@ -295,7 +296,7 @@ module Avo
       # def get_action_arguments / def get_filter_arguments / def get_scope_arguments
       define_method "get_#{entity}_arguments" do |entity_class|
         klass = send("get_#{plural_entity}").find { |entity| entity[:class].to_s == entity_class.to_s }
-        
+
         raise "Couldn't find '#{entity_class}' in the 'def #{plural_entity}' method on your '#{self.class}' resource." if klass.nil?
 
         klass[:arguments]
@@ -303,14 +304,14 @@ module Avo
     end
 
     def hydrate(record: nil, view: nil, user: nil, params: nil)
-      @view = view if view.present?
+      @view = Avo::ViewInquirer.new(view) if view.present?
       @user = user if user.present?
       @params = params if params.present?
 
       if record.present?
         @record = record
 
-        hydrate_model_with_default_values if @view == :new
+        hydrate_model_with_default_values if @view&.new?
       end
 
       self

data/lib/avo/concerns/has_helpers.rb

@@ -0,0 +1,18 @@
+module Avo
+  module Concerns
+    module HasHelpers
+      def helpers
+        @helpers ||= Class.new do
+          def initialize
+            helper_names = ActionController::Base.all_helpers_from_path Rails.root.join("app", "helpers")
+            helpers = ActionController::Base.modules_for_helpers helper_names
+
+            helpers.each do |helper|
+              extend helper
+            end
+          end
+        end.new
+      end
+    end
+  end
+end

data/lib/avo/concerns/has_items.rb

@@ -273,7 +273,7 @@ module Avo
           end
           .select do |item|
             # On location field we can have field coordinates and setters with different names like latitude and longitude
-            if !item.is_a?(Avo::Fields::LocationField) && !item.is_heading? && view.in?([:edit, :update, :new, :create])
+            if !item.is_a?(Avo::Fields::LocationField) && !item.is_heading? && view.in?(%w[edit update new create])
               if item.respond_to?(:id)
                 item.resource.record.respond_to?("#{item.id}=")
               else

data/lib/avo/concerns/visible_in_different_views.rb

@@ -61,7 +61,7 @@ module Avo
       def except_on(*where)
         show_on_all
         normalize_views(where).flatten.each do |view|
-          show_on_view view
+          hide_on_view view
         end
       end
 
@@ -113,12 +113,18 @@ module Avo
 
       def normalize_views(*views_and_groups)
         forms = views_and_groups.flatten! & [:forms]
+        display = views_and_groups & [:display]
 
         if forms.present?
           views_and_groups -= forms
           views_and_groups += [:new, :edit]
         end
 
+        if display.present?
+          views_and_groups -= display
+          views_and_groups += [:index, :show]
+        end
+
         views_and_groups.flatten.uniq
       end
     end

data/lib/avo/concerns/visible_items.rb

@@ -0,0 +1,43 @@
+# This concern helps us figure out what items are visible for each tab, panel or sidebar
+module Avo
+  module Concerns
+    module VisibleItems
+      extend ActiveSupport::Concern
+      def items
+        items_holder&.items || []
+      end
+
+      def visible_items
+        items
+          .select do |item|
+            if item.respond_to? :hydrate
+              item.hydrate(view: view, resource: resource)
+            end
+
+            visible(item)
+          end
+      end
+
+      def visible(item)
+        return item.visible? if !item.is_field?
+
+        return false if item.respond_to?(:authorized?) && item.resource.present? && !item.authorized?
+
+        item.visible? && item.visible_in_view?(view: view)
+      end
+
+      def visible?
+        any_item_visible = visible_items.any?
+        return any_item_visible if !respond_to?(:visible_on?)
+
+        visible_on?(view) && any_item_visible
+      end
+
+      def hydrate(view: nil)
+        @view = view
+
+        self
+      end
+    end
+  end
+end

data/lib/avo/configuration.rb

@@ -36,13 +36,14 @@ module Avo
     attr_accessor :main_menu
     attr_accessor :profile_menu
     attr_accessor :model_resource_mapping
-    attr_accessor :resource_default_view
+    attr_reader :resource_default_view
     attr_accessor :authorization_client
     attr_accessor :field_wrapper_layout
     attr_accessor :sign_out_path_name
     attr_accessor :resources
     attr_accessor :prefix_path
     attr_accessor :resource_parent_controller
+    attr_accessor :mount_avo_engines
 
     def initialize
       @root_path = "/avo"
@@ -88,11 +89,12 @@ module Avo
       @main_menu = nil
       @profile_menu = nil
       @model_resource_mapping = {}
-      @resource_default_view = :show
+      @resource_default_view = Avo::ViewInquirer.new("show")
       @authorization_client = :pundit
       @field_wrapper_layout = :inline
       @resources = nil
       @resource_parent_controller = "Avo::ResourcesController"
+      @mount_avo_engines = true
     end
 
     def current_user_method(&block)
@@ -158,6 +160,10 @@ module Avo
         "community"
       end
     end
+
+    def resource_default_view=(view)
+      @resource_default_view = Avo::ViewInquirer.new(view.to_s)
+    end
   end
 
   def self.configuration

data/lib/avo/current.rb

@@ -24,6 +24,7 @@ class Avo::Current < ActiveSupport::CurrentAttributes
   attribute :resource_manager
   attribute :tool_manager
   attribute :plugin_manager
+  attribute :locale
 
   delegate :params, to: :request
 

data/lib/avo/execution_context.rb

@@ -1,6 +1,8 @@
 module Avo
   class ExecutionContext
-    attr_accessor :target, :context, :params, :view_context, :current_user, :request, :include, :main_app, :avo
+    include Avo::Concerns::HasHelpers
+
+    attr_accessor :target, :context, :params, :view_context, :current_user, :request, :include, :main_app, :avo, :locale
 
     def initialize(**args)
       # Extend the class with custom modules if required.
@@ -24,6 +26,7 @@ module Avo
       @params ||= Avo::Current.params
       @request ||= Avo::Current.request
       @view_context ||= Avo::Current.view_context
+      @locale ||= Avo::Current.locale
       @main_app ||= @view_context.main_app
       @avo ||= @view_context.avo
     end

data/lib/avo/fields/badge_field.rb

@@ -8,7 +8,7 @@ module Avo
 
         hide_on [:edit, :new]
 
-        default_options = {info: :info, success: :success, danger: :danger, warning: :warning}
+        default_options = {info: :info, success: :success, danger: :danger, warning: :warning, secondary: :secondary}
         @options = args[:options].present? ? default_options.merge(args[:options]) : default_options
       end
     end