avo 3.0.0.pre19 → 3.0.1.beta1

data/app/components/avo/tab_switcher_component.rb

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

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

@@ -44,6 +44,26 @@
             <%= render sidebar_component form: form %>
           <% end %>
         <% end %>
+        <% if Avo.configuration.buttons_on_form_footers %>
+          <% c.with_footer_tools do %>
+            <div class="mt-4">
+              <%= a_link back_path,
+              style: :text,
+              icon: 'arrow-left' do %>
+                <%= t('avo.cancel').capitalize %>
+              <% end %>
+              <% if can_see_the_save_button? %>
+                <%= a_button color: :primary,
+                style: :primary,
+                loading: true,
+                type: :submit,
+                icon: 'save' do %>
+                  <%= t('avo.save').capitalize %>
+                <% end %>
+              <% end %>
+            </div>
+          <% end %>
+        <% end %>
       <% end %>
       <%= content_tag :div, class: 'space-y-12' do %>
         <% @resource.get_items.each_with_index do |item, index| %>
@@ -51,15 +71,6 @@
           <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: item, index: index + 1, view: view, form: form %>
         <% end %>
       <% end %>
-      <% if Avo.configuration.buttons_on_form_footers %>
-        <%= render Avo::PanelComponent.new do |c| %>
-          <% c.with_footer_tools do %>
-            <% @resource.render_edit_controls.each do |control| %>
-              <%= render_control control %>
-            <% end %>
-          <% end %>
-        <% end %>
-      <% end %>
     <% end %>
   <% end %>
 <% end %>

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 = Avo::ViewInquirer.new(view)
+    @view = 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?(%w[edit update])
+    view.in?([: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 = Avo::ViewInquirer.new("index")
+    @view = :index
     @query = query
     @scopes = scopes
   end

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

@@ -4,7 +4,7 @@
     resource_name: @resource.class.to_s,
     record_id: @resource.record.id,
     selected_resources_name: @resource.model_key,
-    selected_resources: [@resource.record.to_param],
+    selected_resources: [@resource.record.id],
     **@resource.stimulus_data_attributes
   } do %>
   <%= render Avo::PanelComponent.new(name: title, description: @resource.description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>

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 = Avo::ViewInquirer.new("show")
+    @view = :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 = Avo::ViewInquirer.new("new")
+      @view = :new
 
       @resource.hydrate(record: @record, view: @view, user: _current_user, params: params)
       @record = ActionModel.new @action.get_attributes_for_action
@@ -21,13 +21,23 @@ module Avo
 
     def handle
       resource_ids = action_params[:fields][:avo_resource_ids].split(",")
+      @selected_query = action_params[:fields][:avo_selected_query]
 
-      performed_action = @action.handle_action(
-        fields: action_params[:fields].except(:avo_resource_ids, :avo_selected_query),
+      fields = action_params[:fields].except(:avo_resource_ids, :avo_selected_query)
+
+      args = {
+        fields: fields,
         current_user: _current_user,
-        resource: resource,
-        query: decrypted_query || @resource.find_record(resource_ids, params: params)
-      )
+        resource: resource
+      }
+
+      args[:records] = if @selected_query.present?
+        @resource.model_class.find_by_sql decrypted_query
+      else
+        @resource.find_record resource_ids, params: params
+      end
+
+      performed_action = @action.handle_action(**args)
 
       respond performed_action.response
     end
@@ -96,9 +106,10 @@ module Avo
     end
 
     def decrypted_query
-      return if (encrypted_query = action_params[:fields][:avo_selected_query]).blank?
-
-      Marshal.load(Avo::Services::EncryptionService.decrypt(message: encrypted_query, purpose: :select_all))
+      Avo::Services::EncryptionService.decrypt(
+        message: @selected_query,
+        purpose: :select_all
+      )
     end
 
     def decrypted_arguments

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_s, user: _current_user, params: params)
+      @resource = resource.new(view: action_name.to_sym, user: _current_user, params: params)
 
       set_authorization
     end
@@ -149,12 +149,12 @@ module Avo
     end
 
     def set_view
-      @view = Avo::ViewInquirer.new(action_name.to_s)
+      @view = action_name.to_sym
     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

@@ -75,8 +75,6 @@ module Avo
       @resources = @records.map do |record|
         @resource.hydrate(record: record, params: params).dup
       end
-
-      set_component_for __method__
     end
 
     def show
@@ -100,8 +98,6 @@ module Avo
 
       add_breadcrumb @resource.record_title
       add_breadcrumb I18n.t("avo.details").upcase_first
-
-      set_component_for __method__
     end
 
     def new
@@ -123,8 +119,6 @@ module Avo
 
       add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
       add_breadcrumb t("avo.new").humanize
-
-      set_component_for __method__, fallback_view: :edit
     end
 
     def create
@@ -167,8 +161,6 @@ module Avo
       add_breadcrumb t("avo.new").humanize
       set_actions
 
-      set_component_for :edit
-
       if saved
         create_success_action
       else
@@ -178,8 +170,6 @@ module Avo
 
     def edit
       set_actions
-
-      set_component_for __method__
     end
 
     def update
@@ -188,8 +178,6 @@ module Avo
       @resource = @resource.hydrate(record: @record, view: :edit, user: _current_user)
       set_actions
 
-      set_component_for :edit
-
       if saved
         update_success_action
       else
@@ -529,7 +517,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)
@@ -552,31 +540,5 @@ module Avo
     def pagy_query
       @query
     end
-
-    # Set the view component for the current view
-    # It will try to use the custom component if it's set, otherwise it will use the default one
-    def set_component_for(view, fallback_view: nil)
-      # Fetch the components from the resource
-      components = Avo::ExecutionContext.new(
-        target: @resource.components,
-        resource: @resource,
-        record: @record,
-        view: @view
-      ).handle
-
-      # If the component is not set, use the default one
-      if (custom_component = components.dig("resource_#{view}_component".to_sym)).nil?
-        return @component = "Avo::Views::Resource#{(fallback_view || view).to_s.classify}Component".constantize
-      end
-
-      # If the component is set, try to use it
-      @component = custom_component.to_s.safe_constantize
-
-      # If the component is not found, raise an error
-      if @component.nil?
-        raise "The component '#{custom_component}' was not found.\n" \
-        "That component was fetched from 'self.components' option inside '#{@resource.class}' resource."
-      end
-    end
   end
 end

data/app/controllers/avo/search_controller.rb

@@ -9,8 +9,6 @@ module Avo
 
     def show
       render json: search_resources([resource])
-    rescue => error
-      render_search_error(error)
     end
 
     private
@@ -42,14 +40,14 @@ module Avo
         query: resource.query_scope
       ).handle
 
-      query = apply_scope(query) if should_apply_any_scope?
-
       # Get the count
       results_count = query.reselect(resource.model_class.primary_key).count
 
       # Get the results
       query = query.limit(8)
 
+      query = apply_scope(query) if should_apply_any_scope?
+
       results = apply_search_metadata(query, resource)
 
       header = resource.plural_name
@@ -166,20 +164,5 @@ 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,7 +7,6 @@ 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/resources_helper.rb

@@ -38,7 +38,7 @@ module Avo
     end
 
     def item_selector_init(resource)
-      "data-resource-name='#{resource.model_key}' data-resource-id='#{resource.record.to_param}' data-controller='item-selector'"
+      "data-resource-name='#{resource.model_key}' data-resource-id='#{resource.record.id}' data-controller='item-selector'"
     end
 
     def item_selector_input(floating: false, size: :md)

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/base/edit.html.erb

@@ -1 +1 @@
-<%= render @component.new(resource: @resource, view: @view, actions: @actions) %>
+<%= render Avo::Views::ResourceEditComponent.new(resource: @resource, view: @view, actions: @actions) %>

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

@@ -1,5 +1,5 @@
 <%= render Avo::TurboFrameWrapperComponent.new(params[:turbo_frame]) do %>
-  <%= render @component.new(
+  <%= render Avo::Views::ResourceIndexComponent.new(
       resource: @resource,
       resources: @resources,
       records: @records,

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

@@ -1,2 +1,2 @@
-<%= render @component.new(resource: @resource, record: @record, view: @view, actions: @actions) %>
+<%= render Avo::Views::ResourceEditComponent.new(resource: @resource, record: @record, view: @view, actions: @actions) %>
 

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

@@ -1,5 +1,5 @@
 <%= render Avo::TurboFrameWrapperComponent.new(params[:turbo_frame]) do %>
-  <%= render @component.new(
+  <%= render Avo::Views::ResourceShowComponent.new(
     resource: @resource,
     reflection: @reflection,
     actions: @actions,

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

@@ -12,18 +12,10 @@
     <%= render Avo::AssetManager::StylesheetComponent.new asset_manager: Avo.asset_manager %>
     <% if Avo::PACKED %>
       <%= javascript_include_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
-      <% if Rails.root.join("config", "avo", "tailwind.config.js").exist? %>
-        <%= stylesheet_link_tag "avo.tailwind", "data-turbo-track": "reload", defer: true %>
-      <% else %>
-        <%= stylesheet_link_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
-      <% end %>
+      <%= stylesheet_link_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
     <% else %>
       <%= javascript_include_tag "avo.base", "data-turbo-track": "reload", defer: true %>
-      <% if Rails.root.join("config", "avo", "tailwind.config.js").exist? %>
-        <%= stylesheet_link_tag "avo.tailwind", "data-turbo-track": "reload", defer: true %>
-      <% else %>
-        <%= stylesheet_link_tag "avo.base", "data-turbo-track": "reload", defer: true %>
-      <% end %>
+      <%= stylesheet_link_tag "avo.base", "data-turbo-track": "reload", defer: true %>
       <% if Rails.env.development? %>
         <%= javascript_include_tag "hotwire-livereload", defer: true %>
       <% end %>

data/bin/dev

@@ -3,8 +3,6 @@
 PORT="${PORT:-3030}"
 export PORT
 
-bundle exec rake avo:sym_link
-
 if command -v overmind &> /dev/null; then
   overmind start -f Procfile.dev "$@"
 else

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/config/routes.rb

@@ -4,10 +4,9 @@ Avo::Engine.routes.draw do
   get "resources", to: redirect(Avo.configuration.root_path)
   get "dashboards", to: redirect(Avo.configuration.root_path)
 
-  # 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
+  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)
 
   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", "Drafting"].sample }
+    stage { ["Discovery", "Idea", "Done", "On hold", "Cancelled"].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

@@ -25,7 +25,7 @@ module Avo
     delegate :view, to: :class
     # TODO: find a differnet way to delegate this to the uninitialized Current variable
     delegate :context, to: Avo::Current
-    def current_user
+    def curent_user
       Avo::Current.user
     end
     delegate :params, to: Avo::Current
@@ -65,7 +65,7 @@ module Avo
       self.class.record = record
       self.class.resource = resource
       self.class.user = user
-      self.class.view = Avo::ViewInquirer.new(view)
+      self.class.view = view
       @arguments = arguments
 
       self.class.message ||= I18n.t("avo.are_you_sure_you_want_to_run_this_option")
@@ -101,34 +101,39 @@ module Avo
     end
 
     def handle_action(**args)
-      processed_fields = if args[:fields].present?
-        # Fetching the field definitions and not the actual fields (get_fields) because they will break if the user uses a `visible` block and adds a condition using the `params` variable. The params are different in the show method and the handle method.
-        action_fields = get_field_definitions.map { |field| [field.id, field] }.to_h
-
-        # For some fields, like belongs_to, the id and database_id differ (user vs user_id).
-        # That's why we need to fetch the database_id for when we process the action.
-        action_fields_by_database_id = action_fields.map do |id, value|
-          [value.database_id.to_sym, value]
-        end.to_h
+      records, fields, current_user, resource = args.values_at(:records, :fields, :current_user, :resource)
+      # Fetching the field definitions and not the actual fields (get_fields) because they will break if the user uses a `visible` block and adds a condition using the `params` variable. The params are different in the show method and the handle method.
+      action_fields = get_field_definitions.map { |field| [field.id, field] }.to_h
+
+      # For some fields, like belongs_to, the id and database_id differ (user vs user_id).
+      # That's why we need to fetch the database_id for when we process the action.
+      action_fields_by_database_id = action_fields.map do |id, value|
+        [value.database_id.to_sym, value]
+      end.to_h
 
-        args[:fields].to_unsafe_h.map do |name, value|
+      if fields.present?
+        processed_fields = fields.to_unsafe_h.map do |name, value|
           field = action_fields_by_database_id[name.to_sym]
 
           next if field.blank?
 
           [name, field.resolve_attribute(value)]
-        end.reject(&:blank?).to_h
+        end
+
+        processed_fields = processed_fields.reject(&:blank?).to_h
       else
-        {}
+        processed_fields = {}
       end
 
-      handle(
+      args = {
         fields: processed_fields.with_indifferent_access,
-        current_user: args[:current_user],
-        resource: args[:resource],
-        records: args[:query],
-        query: args[:query]
-      )
+        current_user: current_user,
+        resource: resource
+      }
+
+      args[:records] = records
+
+      handle(**args)
 
       self
     end
@@ -136,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,11 +9,10 @@ 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
-    def current_user
+    def curent_user
       Avo::Current.user
     end
     delegate :params, to: Avo::Current
@@ -66,7 +65,6 @@ module Avo
     class_attribute :extra_params
     class_attribute :link_to_child_resource, default: false
     class_attribute :map_view
-    class_attribute :components, default: {}
 
     # EXTRACT:
     class_attribute :ordering
@@ -234,14 +232,14 @@ module Avo
     delegate :model_key, to: :class
 
     def initialize(record: nil, view: nil, user: nil, params: nil)
-      @view = Avo::ViewInquirer.new(view) if view.present?
+      @view = 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,23 +293,19 @@ 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]
+        send("get_#{plural_entity}").find { |entity| entity[:class].to_s == entity_class.to_s }[:arguments]
       end
     end
 
     def hydrate(record: nil, view: nil, user: nil, params: nil)
-      @view = Avo::ViewInquirer.new(view) if view.present?
+      @view = 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
@@ -446,7 +440,7 @@ module Avo
     def hydrate_model_with_default_values
       default_values = get_fields
         .select do |field|
-          !field.computed && !field.is_a?(Avo::Fields::HeadingField)
+          !field.computed
         end
         .map do |field|
           value = field.value

data/lib/avo/concerns/filters_session_handler.rb

@@ -26,16 +26,16 @@ module Avo
       end
 
       def filters_session_key
-        @filters_session_key ||= "/filters/" << %w[
+        @filters_session_key ||= '/filters/' << %w[
           turbo_frame controller resource_name related_name
           action id
-        ].map { |key| params[key] }.compact.join("/")
+        ].map { |key| params[key] }.compact.join('/')
       end
 
       def cache_resource_filters?
         Avo::ExecutionContext.new(
           target: Avo.configuration.cache_resource_filters,
-          current_user: _current_user,
+          current_user: current_user,
           resource: @resource
         ).handle
       end