avo 2.11.3.pre.3 → 2.13.0

data/lib/avo/fields/key_value_field.rb

@@ -12,8 +12,8 @@ module Avo
         hide_on :index
 
         @key_label = args[:key_label] if args[:key_label].present?
-        @value_label = args[:value_label]if args[:value_label].present?
-        @action_text = args[:action_text] if args[:action_text].present?
+        @value_label = args[:value_label] if args[:value_label].present?
+        @action_text = args[:action_text] if args[:action_text].present? # This should be add_row_label
         @delete_text = args[:delete_text] if args[:delete_text].present?
 
         @disable_editing_keys = args[:disable_editing_keys].present? ? args[:disable_editing_keys] : false
@@ -31,25 +31,25 @@ module Avo
       def key_label
         return @key_label if @key_label.present?
 
-        I18n.translate('avo.key_value_field.key')
+        I18n.translate("avo.key_value_field.key")
       end
 
       def value_label
         return @value_label if @value_label.present?
 
-        I18n.translate('avo.key_value_field.value')
+        I18n.translate("avo.key_value_field.value")
       end
 
       def action_text
         return @action_text if @action_text.present?
 
-        I18n.translate('avo.key_value_field.add_row')
+        I18n.translate("avo.key_value_field.add_row")
       end
 
       def delete_text
         return @delete_text if @delete_text.present?
 
-        I18n.translate('avo.key_value_field.delete_row')
+        I18n.translate("avo.key_value_field.delete_row")
       end
 
       def to_permitted_param

data/lib/avo/hosts/base_host.rb

@@ -1,6 +1,6 @@
 require "dry-initializer"
 
-# This object holds some data tha is usually needed to compute blocks around the app.
+# This object holds some data that is usually needed to compute blocks around the app.
 module Avo
   module Hosts
     class BaseHost
@@ -10,6 +10,7 @@ module Avo
       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 }
+      # This is optional because we might instantiate the `Host` first and later hydrate it with a block.
       option :block, optional: true
 
       delegate :authorize, to: Avo::Services::AuthorizationService

data/lib/avo/hosts/dashboard_card.rb

@@ -7,7 +7,7 @@ module Avo
 
       option :context
       option :range
-      option :parent
+      option :dashboard
       option :card
       option :params
       option :options

data/lib/avo/hosts/search_scope_host.rb

@@ -0,0 +1,7 @@
+module Avo
+  module Hosts
+    class SearchScopeHost < BaseHost
+      option :scope
+    end
+  end
+end

data/lib/avo/licensing/h_q.rb

@@ -22,16 +22,24 @@ module Avo
       def response
         expire_cache_if_overdue
 
+        # ------------------------------------------------------------------
+        # You could set this to true to become a pro user for free.
+        # I'd rather you didn't. Avo takes time & love to build,
+        # and I can't do that if it doesn't pay my bills!
+        #
+        # If you want Pro, help pay for its development.
+        # Can't afford it? Get in touch: adrian@avohq.io
+        # ------------------------------------------------------------------
         make_request
       end
 
       # Some cache stores don't auto-expire their keys and payloads so we need to do it for them
       def expire_cache_if_overdue
         return unless cached_response.present?
-        return unless cached_response['fetched_at'].present?
+        return unless cached_response["fetched_at"].present?
 
         allowed_time = 1.hour
-        parsed_time = Time.parse(cached_response['fetched_at'].to_s)
+        parsed_time = Time.parse(cached_response["fetched_at"].to_s)
         time_has_passed = parsed_time < Time.now - allowed_time
 
         clear_response if time_has_passed
@@ -159,7 +167,7 @@ module Avo
       def perform_request
         ::Rails.logger.debug "[Avo] Performing request to avohq.io API to check license availability." if Rails.env.development?
 
-        HTTParty.post ENDPOINT, body: payload.to_json, headers: {'Content-type': "application/json"}, timeout: REQUEST_TIMEOUT
+        HTTParty.post ENDPOINT, body: payload.to_json, headers: {"Content-type": "application/json"}, timeout: REQUEST_TIMEOUT
       end
 
       def app_name
@@ -177,7 +185,7 @@ module Avo
 
         {
           "#{type}_count": type_count,
-          "#{type}_per_resource": type_per_resource,
+          "#{type}_per_resource": type_per_resource
         }
       end
 

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/menu/builder.rb

@@ -11,6 +11,8 @@ class Avo::Menu::Builder
   delegate :request, to: ::Avo::App
   delegate :root_path, to: ::Avo::App
   delegate :view_context, to: ::Avo::App
+  delegate :main_app, to: :view_context
+  delegate :avo, to: :view_context
 
   def initialize(name: nil, items: [])
     @menu = Avo::Menu::Menu.new

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,58 @@
+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 :record, 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)
+          items_holder.add_item Avo::Resources::Controls::Action.new(klass, record: record, 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/tab.rb

@@ -13,7 +13,7 @@ class Avo::Tab
 
   def initialize(name: nil, description: nil, view: nil, holds_one_field: false, **args)
     # Initialize the visibility markers
-    # super
+    super
 
     @name = name
     @description = description
@@ -25,8 +25,6 @@ class Avo::Tab
     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?
-
-    initialize_visibility args
   end
 
   def hydrate(view: nil)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.11.3.pre.3" unless const_defined?(:VERSION)
+  VERSION = "2.13.0" 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/cards/partial_card_partial.tt

@@ -1,6 +1,6 @@
 <div class="flex-1 flex p-4">
   <div class="place-self-end">
-    Parent ID: <%%= @parent.id %>
+    Dashboard ID: <%%= @dashboard.id %>
     <br />
     <br />
     Customize this partial under <code class='p-1 rounded bg-gray-500 text-white text-sm'>app/views/avo/cards/_<%= name.underscore %>.html.erb</code>

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

@@ -51,6 +51,7 @@ Avo.configure do |config|
   # config.view_component_path = "app/components"
   # config.display_license_request_timeout_error = true
   # config.disabled_features = []
+  # config.resource_controls = :right
 
 
   ## == Breadcrumbs ==

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

@@ -1,7 +1,7 @@
 class <%= resource_class %> < Avo::BaseResource
   self.title = :id
   self.includes = []
-  # self.search_query = ->(params:) do
+  # self.search_query = -> do
   #   scope.ransack(id_eq: params[:q], m: "or").result(distinct: false)
   # end
 

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:)