avo 2.11.2.pre.1 → 2.11.3.pre.1

data/lib/avo/base_resource.rb

@@ -3,8 +3,8 @@ module Avo
     extend ActiveSupport::DescendantsTracker
 
     include ActionView::Helpers::UrlHelper
-    include Avo::Concerns::HasModel
     include Avo::Concerns::HasFields
+    include Avo::Concerns::HasEditableControls
     include Avo::Concerns::HasStimulusControllers
     include Avo::Concerns::ModelClassConstantized
 
@@ -274,15 +274,8 @@ module Avo
 
       # Write the user configured extra params to the model
       if extra_params.present?
-        extra_params.each do |param_id|
-          # if it's a nested array, use the key
-          param_id = param_id.first.first if param_id.is_a? Hash
-
-          next unless @model.respond_to? "#{param_id}="
-
-          param_value = params[param_id]
-          @model.send("#{param_id}=", param_value)
-        end
+        # Let Rails fill in the rest of the params
+        model.assign_attributes params.permit(extra_params)
       end
 
       model
@@ -446,5 +439,9 @@ module Avo
     def ordering_host(**args)
       Avo::Hosts::Ordering.new resource: self, options: self.class.ordering, **args
     end
+
+    def has_model_id?
+      model.present? && model.id.present?
+    end
   end
 end

data/lib/avo/concerns/has_editable_controls.rb

@@ -0,0 +1,34 @@
+module Avo
+  module Concerns
+    module HasEditableControls
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :show_controls
+        class_attribute :show_controls_holder
+        class_attribute :show_controls_holder_called, default: false
+      end
+
+      def has_show_controls?
+        return false if ::Avo::App.license.lacks_with_trial(:resource_show_controls)
+
+        self.class.show_controls.present?
+      end
+
+      def render_show_controls
+        return [] if ::Avo::App.license.lacks_with_trial(:resource_show_controls)
+
+        if show_controls.present?
+          Avo::Resources::Controls::ExecutionContext.new(
+            block: show_controls,
+            resource: self,
+            model: model,
+            view: view
+          ).handle.items
+        else
+          []
+        end
+      end
+    end
+  end
+end

data/lib/avo/fields/date_time_field.rb

@@ -28,8 +28,8 @@ module Avo
       end
 
       def fill_field(model, key, value, params)
-        if value.nil?
-          model[id] = nil
+        if value.in?(["", nil])
+          model[id] = value
 
           return model
         end

data/lib/avo/fields/has_base_field.rb

@@ -5,6 +5,7 @@ module Avo
       attr_accessor :scope
       attr_accessor :attach_scope
       attr_accessor :description
+      attr_accessor :discreet_pagination
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -14,6 +15,7 @@ module Avo
         @display = args[:display].present? ? args[:display] : :show
         @searchable = args[:searchable] == true
         @description = args[:description]
+        @discreet_pagination = args[:discreet_pagination] || false
       end
 
       def searchable

data/lib/avo/licensing/pro_license.rb

@@ -15,6 +15,7 @@ module Avo
           :dashboards,
           :menu_editor,
           :stimulus_js_integration,
+          :resource_show_controls,
           :advanced_fields
         ]
       end

data/lib/avo/resources/controls/action.rb

@@ -0,0 +1,32 @@
+module Avo
+  module Resources
+    module Controls
+      class Action < BaseControl
+        attr_reader :klass
+
+        def initialize(klass, model: nil, resource: nil, view: nil, **args)
+          super(**args)
+
+          @klass = klass
+          @resource = resource
+          @model = model
+          @view = view
+        end
+
+        def action
+          return @instance if @instance.present?
+
+          @instance = @klass.new(model: @model, resource: @resource, view: @view)
+        end
+
+        def path
+          Avo::Services::URIService.parse(@resource.record_path).append_paths("actions", action.param_id).to_s
+        end
+
+        def label
+          @args[:label] || action.action_name
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/actions_list.rb

@@ -0,0 +1,19 @@
+module Avo
+  module Resources
+    module Controls
+      class ActionsList < BaseControl
+        def exclude
+          Array.wrap(@args[:exclude]) || []
+        end
+
+        def color
+          @args[:color] || :primary
+        end
+
+        def style
+          @args[:style] || :outline
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/back_button.rb

@@ -0,0 +1,13 @@
+module Avo
+  module Resources
+    module Controls
+      class BackButton < BaseControl
+        def initialize(**args)
+          super(**args)
+
+          @label = I18n.t("avo.go_back")
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/base_control.rb

@@ -0,0 +1,59 @@
+module Avo
+  module Resources
+    module Controls
+      class BaseControl
+        def initialize(**args)
+          @args = args
+        end
+
+        def label
+          @args[:label] || @label
+        end
+
+        def title
+          @args[:title]
+        end
+
+        def color
+          @args[:color] || :gray
+        end
+
+        def style
+          @args[:style] || :text
+        end
+
+        def icon
+          @args[:icon] || nil
+        end
+
+        def back_button?
+          is_a? Avo::Resources::Controls::BackButton
+        end
+
+        def edit_button?
+          is_a? Avo::Resources::Controls::EditButton
+        end
+
+        def delete_button?
+          is_a? Avo::Resources::Controls::DeleteButton
+        end
+
+        def actions_list?
+          is_a? Avo::Resources::Controls::ActionsList
+        end
+
+        def link_to?
+          is_a? Avo::Resources::Controls::LinkTo
+        end
+
+        def detach_button?
+          is_a? Avo::Resources::Controls::DetachButton
+        end
+
+        def action?
+          is_a? Avo::Resources::Controls::Action
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/delete_button.rb

@@ -0,0 +1,13 @@
+module Avo
+  module Resources
+    module Controls
+      class DeleteButton < BaseControl
+        def initialize(**args)
+          super(**args)
+
+          @label = I18n.t("avo.delete").capitalize
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/detach_button.rb

@@ -0,0 +1,13 @@
+module Avo
+  module Resources
+    module Controls
+      class DetachButton < BaseControl
+        def initialize(**args)
+          super(**args)
+
+          @label = I18n.t("avo.detach_item", item: title).capitalize
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/edit_button.rb

@@ -0,0 +1,13 @@
+module Avo
+  module Resources
+    module Controls
+      class EditButton < BaseControl
+        def initialize(**args)
+          super(**args)
+
+          @label = I18n.t("avo.edit").capitalize
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/execution_context.rb

@@ -0,0 +1,59 @@
+require "dry-initializer"
+
+# This object holds some data tha is usually needed to compute blocks around the app.
+module Avo
+  module Resources
+    module Controls
+      class ExecutionContext
+        extend Dry::Initializer
+
+        option :context, default: proc { Avo::App.context }
+        option :params, default: proc { Avo::App.params }
+        option :view_context, default: proc { Avo::App.view_context }
+        option :current_user, default: proc { Avo::App.current_user }
+        option :items_holder, default: proc { Avo::Resources::Controls::ItemsHolder.new }
+        option :resource, optional: true
+        option :model, optional: true
+        option :view, optional: true
+        option :block, optional: true
+
+        delegate :authorize, to: Avo::Services::AuthorizationService
+
+        def handle
+          instance_exec(&block)
+        end
+
+        private
+
+        def back_button(**args)
+          items_holder.add_item Avo::Resources::Controls::BackButton.new(**args)
+        end
+
+        def delete_button(**args)
+          items_holder.add_item Avo::Resources::Controls::DeleteButton.new(**args)
+        end
+
+        def detach_button(**args)
+          items_holder.add_item Avo::Resources::Controls::DetachButton.new(**args)
+        end
+
+        def edit_button(**args)
+          items_holder.add_item Avo::Resources::Controls::EditButton.new(**args)
+        end
+
+        def link_to(label, path, **args)
+          items_holder.add_item Avo::Resources::Controls::LinkTo.new(label: label, path: path, **args)
+        end
+
+        def actions_list(**args)
+          items_holder.add_item Avo::Resources::Controls::ActionsList.new(**args)
+        end
+
+        def action(klass, **args)
+          # abort model.inspect
+          items_holder.add_item Avo::Resources::Controls::Action.new(klass, model: model, resource: resource, view: view, **args)
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/items_holder.rb

@@ -0,0 +1,19 @@
+module Avo
+  module Resources
+    module Controls
+      class ItemsHolder
+        attr_reader :items
+
+        def initialize
+          @items = []
+        end
+
+        def add_item(instance)
+          @items << instance
+
+          self
+        end
+      end
+    end
+  end
+end

data/lib/avo/resources/controls/link_to.rb

@@ -0,0 +1,27 @@
+module Avo
+  module Resources
+    module Controls
+      class LinkTo < BaseControl
+        def initialize(**args)
+          super(**args)
+        end
+
+        def path
+          @args[:path]
+        end
+
+        def target
+          @args[:target] || nil
+        end
+
+        def data
+          @args[:data] || {}
+        end
+
+        def class
+          @args[:class] || nil
+        end
+      end
+    end
+  end
+end

data/lib/avo/version.rb

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

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

@@ -1,5 +1,5 @@
 class <%= class_name.camelize %> < Avo::BaseAction
-  self.name = '<%= name.underscore.humanize %>'
+  self.name = "<%= name.underscore.humanize %>"
 
   def handle(**args)
     models, fields, current_user, resource = args.values_at(:models, :fields, :current_user, :resource)

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

@@ -1,7 +1,7 @@
 <div class="flex flex-col">
   <%%= render Avo::PanelComponent.new(name: "<%= human_name %>") do |c| %>
     <%% c.tools do %>
-      <%%= a_link('/avo', icon: 'heroicons/solid/academic-cap', style: :primary) do %>
+      <%%= a_link('/avo', icon: 'heroicons/solid/academic-cap', color: :primary, style: :primary) do %>
         Dummy link
       <%% end %>
     <%% end %>

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

@@ -1,5 +1,5 @@
 class <%= class_name.camelize %> < Avo::BaseAction
-  self.name = '<%= name.underscore.humanize %>'
+  self.name = "<%= name.underscore.humanize %>"
   self.standalone = true
 
   def handle(fields:)