avo 2.11.3.pre.3 → 2.13.0

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

@@ -1,7 +1,24 @@
-<%= render Avo::PanelComponent.new(title: @dashboard.name, description: @dashboard.description) do |c| %>
+<%= render Avo::PanelComponent.new(name: @dashboard.name, description: @dashboard.description) do |c| %>
   <% c.bare_content do %>
-    <% if @dashboard.cards.present? %>
-      <%= render Avo::CardsListComponent.new parent: @dashboard %>
+    <% if @dashboard.items.present? %>
+      <div class="min-h-24">
+        <%= content_tag(:div, class: "grid gap-4 grid-cols-1 #{@dashboard.classes}") do %>
+          <% @dashboard.items.each do |item| %>
+            <% if item.is_divider? %>
+              <%= render Avo::Dashboards::DividerComponent.new(divider: item) %>
+            <% elsif item.is_card? %>
+              <%= content_tag(:div, class: "relative bg-white rounded shadow-panel space-y-2 #{item.card_classes} overflow-hidden") do %>
+                <turbo-frame id="<%= item.turbo_frame %>"
+                  src="<%= item.frame_url(enforced_range: @range, params: params) %>"
+                  data-card-index="<%= item.index %>"
+                >
+                  <%= render(Avo::LoadingComponent.new(title: item.label)) %>
+                </turbo-frame>
+              <% end %>
+            <% end %>
+          <% end %>
+        <% end %>
+      </div>
     <% else %>
       <div class="w-full h-full">
         <% if Rails.env.development? %>

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

@@ -14,7 +14,7 @@
   hq_payload = Avo::Licensing::HQ.new(request).payload
 %>
 <div class="flex flex-col">
-  <%= render Avo::PanelComponent.new(title: 'Debug Avo', description: 'Use this page to debug the Avo license.') do |c| %>
+  <%= render Avo::PanelComponent.new(name: 'Debug Avo', description: 'Use this page to debug the Avo license.') do |c| %>
     <% c.tools do %>
     <% end %>
     <% c.bare_content do %>

data/app/views/avo/debug/report.html.erb

@@ -9,6 +9,7 @@
   </div>
   <div class="flex justify-end">
     <%= a_button icon: 'heroicons/outline/clipboard',
+      color: :primary,
       style: :primary,
       data: {
         controller: 'copy-to-clipboard',

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

@@ -1,5 +1,5 @@
 <div class="flex flex-col">
-  <%= render Avo::PanelComponent.new(title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
+  <%= render Avo::PanelComponent.new(name: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
     <% c.body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <div class="px-6 space-y-4">

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

@@ -3,6 +3,12 @@
     data-search-target="autocomplete"
     data-search-resource="<%= resource %>"
     data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
+    <% if via_reflection.present? %>
+      data-via-association="<%= via_reflection[:association] %>"
+      data-via-association-id="<%= via_reflection[:association_id] %>"
+      data-via-reflection-class="<%= via_reflection[:class] %>"
+      data-via-reflection-id="<%= via_reflection[:id] %>"
+    <% end %>
   >
   </div>
   <div class="hidden relative inline-flex text-gray-400 text-sm border border-gray-300 rounded cursor-pointer" data-search-target="button"></div>

data/app/views/avo/private/design.html.erb

@@ -1,7 +1,7 @@
 <div class="flex flex-col">
-  <%= render Avo::PanelComponent.new(title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
+  <%= render Avo::PanelComponent.new(name: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
     <% c.tools do %>
-      <%= a_link('/admin', icon: 'arrow-left', style: :primary, is_link: true) do %>
+      <%= a_link('/admin', icon: 'arrow-left', color: :green, style: :primary, is_link: true) do %>
         Primary
       <% end %>
 

data/config/routes.rb

@@ -35,9 +35,6 @@ Avo::Engine.routes.draw do
     # resources :posts
     Avo::DynamicRouter.routes(self)
 
-    # Cards
-    get "/:resource_name/:id/cards/:card_id", to: "cards#show"
-
     # Associations
     get "/:resource_name/:id/:related_name/new", to: "associations#new", as: "associations_new"
     get "/:resource_name/:id/:related_name/", to: "associations#index", as: "associations_index"

data/lib/avo/base_card.rb

@@ -1,11 +1,10 @@
 module Avo
   class BaseCard
-    include Avo::Concerns::StylesCards
-    include Avo::Fields::FieldExtensions::VisibleInDifferentViews
-
     class_attribute :id
     class_attribute :label
     class_attribute :description
+    class_attribute :cols, default: 1
+    class_attribute :rows, default: 1
     class_attribute :initial_range
     class_attribute :ranges, default: []
     class_attribute :refresh_every
@@ -14,7 +13,7 @@ module Avo
     class_attribute :result_data
     class_attribute :query_block
 
-    attr_accessor :parent
+    attr_accessor :dashboard
     attr_accessor :options
     attr_accessor :index
     attr_accessor :params
@@ -27,8 +26,8 @@ module Avo
       end
     end
 
-    def initialize(parent:, options: {}, index: 0, cols: nil, rows: nil, label: nil, description: nil, refresh_every: nil, **args)
-      @parent = parent
+    def initialize(dashboard:, options: {}, index: 0, cols: nil, rows: nil, label: nil, description: nil, refresh_every: nil)
+      @dashboard = dashboard
       @options = options
       @index = index
       @cols = cols
@@ -36,8 +35,6 @@ module Avo
       @label = label
       @refresh_every = refresh_every
       @description = description
-
-      initialize_visibility args
     end
 
     def label
@@ -56,21 +53,13 @@ module Avo
     end
 
     def turbo_frame
-      if parent_is_dashboard?
-        "#{parent.id}_#{id}"
-      elsif parent_is_resource?
-        "#{parent.id}_#{parent.model.id}_#{id}"
-      end
+      "#{dashboard.id}_#{id}"
     end
 
     def frame_url(enforced_range: nil, params: {})
       enforced_range ||= initial_range || ranges.first
 
-      if parent_is_dashboard?
-        Avo::App.view_context.avo.dashboard_card_path(dashboard.id, id, turbo_frame: turbo_frame, index: index, range: enforced_range, **params.permit!.to_h)
-      elsif parent_is_resource?
-        Avo::App.root_path(paths: ["resources", parent.route_key, parent.model.id, "cards", id], query: {**params.permit!.to_h, turbo_frame: turbo_frame, index: index, range: enforced_range})
-      end
+      Avo::App.view_context.avo.dashboard_card_path(dashboard.id, id, turbo_frame: turbo_frame, index: index, range: enforced_range, **params.permit!)
     end
 
     def card_classes
@@ -87,13 +76,14 @@ module Avo
       }
 
       classes_for_rows = {
-        1 => " min-h-[8rem] row-span-1",
-        2 => " min-h-[16rem] row-span-2",
-        3 => " min-h-[24rem] row-span-3",
-        4 => " min-h-[32rem] row-span-4",
-        5 => " min-h-[40rem] row-span-5",
-        6 => " min-h-[48rem] row-span-6"
+        1 => " h-36",
+        2 => " h-72",
+        3 => " h-[27rem]",
+        4 => " h-[36rem]",
+        5 => " h-[45rem]",
+        6 => " h-[54rem]"
       }
+      # puts ["cols->", cols, classes_for_cols, classes_for_rows, classes_for_cols[cols.to_i]].inspect
 
       result += classes_for_cols[cols.to_i] if classes_for_cols[cols.to_i].present?
       result += classes_for_rows[rows.to_i] if classes_for_rows[rows.to_i].present?
@@ -108,16 +98,15 @@ module Avo
     end
 
     def compute_result
-      Avo::Hosts::DashboardCard.new(card: self, parent: parent, params: params, context: context, range: range, options: options)
+      Avo::Hosts::DashboardCard.new(card: self, dashboard: dashboard, params: params, context: context, range: range, options: options)
         .compute_result
 
       self
     end
 
-    def hydrate(parent: nil, params: nil, view: nil)
-      @parent = parent if parent.present?
+    def hydrate(dashboard: nil, params: nil)
+      @dashboard = dashboard if dashboard.present?
       @params = params if params.present?
-      @view = view if view.present?
 
       self
     end
@@ -146,20 +135,12 @@ module Avo
 
     private
 
-    def parent_is_dashboard?
-      parent.class.superclass == Avo::Dashboards::BaseDashboard
-    end
-
-    def parent_is_resource?
-      parent.class.superclass == Avo::BaseResource
-    end
-
-    def resource
-      parent if parent_is_resource?
+    def cols
+      @cols || self.class.cols
     end
 
-    def dashboard
-      parent if parent_is_dashboard?
+    def rows
+      @rows || self.class.rows
     end
   end
 end

data/lib/avo/base_resource.rb

@@ -3,9 +3,8 @@ module Avo
     extend ActiveSupport::DescendantsTracker
 
     include ActionView::Helpers::UrlHelper
-    include Avo::Concerns::HasCards
-    include Avo::Concerns::HasModel
     include Avo::Concerns::HasFields
+    include Avo::Concerns::HasEditableControls
     include Avo::Concerns::HasStimulusControllers
     include Avo::Concerns::ModelClassConstantized
 
@@ -440,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,
+            record: model,
+            view: view
+          ).handle&.items || []
+        else
+          []
+        end
+      end
+    end
+  end
+end

data/lib/avo/concerns/has_fields.rb

@@ -17,19 +17,19 @@ module Avo
         def field(name, **args, &block)
           ensure_items_holder_initialized
 
-          self.items_holder.field name, **args, &block
+          items_holder.field name, **args, &block
         end
 
         def panel(name = nil, **args, &block)
           ensure_items_holder_initialized
 
-          self.items_holder.panel name, **args, &block
+          items_holder.panel name, **args, &block
         end
 
         def tabs(&block)
           ensure_items_holder_initialized
 
-          self.items_holder.tabs Avo::TabGroupBuilder.parse_block(&block)
+          items_holder.tabs Avo::TabGroupBuilder.parse_block(&block)
         end
 
         def tool(klass, **args)
@@ -39,27 +39,29 @@ module Avo
         end
 
         def heading(body, **args)
-          self.items_holder.heading body, **args
+          ensure_items_holder_initialized
+
+          items_holder.heading body, **args
         end
         # END DSL methods
 
         def items
-          if self.items_holder.present?
-            self.items_holder.items
+          if items_holder.present?
+            items_holder.items
           else
             []
           end
         end
 
         def tools
-          self.tools_holder
+          tools_holder
         end
 
         # Dives deep into panels and tabs to fetch all the fields for a resource.
         def fields(only_root: false)
           fields = []
 
-          self.items.each do |item|
+          items.each do |item|
             next if item.nil?
 
             unless only_root
@@ -76,7 +78,6 @@ module Avo
               end
             end
 
-
             if item.is_field?
               fields << item
             end
@@ -86,7 +87,7 @@ module Avo
         end
 
         def tab_groups
-          self.items.select do |item|
+          items.select do |item|
             item.instance_of? Avo::TabGroup
           end
         end

data/lib/avo/dashboards/base_dashboard.rb

@@ -3,18 +3,63 @@ module Avo
     class BaseDashboard
       extend ActiveSupport::DescendantsTracker
 
-      include Avo::Concerns::HasCards
-
       class_attribute :id
       class_attribute :name
       class_attribute :description
+      class_attribute :items_holder
+      class_attribute :grid_cols, default: 3
       class_attribute :visible, default: true
       class_attribute :index, default: 0
 
-      attr_reader :view
-      attr_reader :params
-
       class << self
+        def card(klass, label: nil, description: nil, cols: nil, rows: nil, refresh_every: nil, options: {})
+          self.items_holder ||= []
+
+          self.items_holder << klass.new(dashboard: self,
+            label: label,
+            description: description,
+            cols: cols,
+            rows: rows,
+            refresh_every: refresh_every,
+            options: options,
+            index: index
+          )
+          self.index += 1
+        end
+
+        def item_at_index(index)
+          items.find do |item|
+            next if item.index.blank?
+
+            item.index == index
+          end
+        end
+
+        def divider(**args)
+          self.items_holder ||= []
+
+          self.items_holder << BaseDivider.new(**args)
+        end
+
+        def items
+          self.items_holder
+        end
+
+        def classes
+          case grid_cols
+          when 3
+            "sm:grid-cols-3"
+          when 4
+            "sm:grid-cols-4"
+          when 5
+            "sm:grid-cols-5"
+          when 6
+            "sm:grid-cols-6"
+          else
+            "sm:grid-cols-3"
+          end
+        end
+
         def navigation_label
           name
         end
@@ -39,16 +84,6 @@ module Avo
           !is_visible?
         end
       end
-
-      def initialize
-        @view = :dashboard
-      end
-
-      def hydrate(params:)
-        @params = params
-
-        self
-      end
     end
   end
 end

data/lib/avo/dashboards/base_divider.rb

@@ -5,16 +5,12 @@ module Avo
       attr_reader :invisible
       attr_reader :index
 
-      include Avo::Fields::FieldExtensions::VisibleInDifferentViews
-
       class_attribute :id
 
-      def initialize(label: nil, invisible: false, index: nil, **args)
+      def initialize(label: nil, invisible: false, index: nil)
         @label = label
         @invisible = invisible
         @index = index
-
-        initialize_visibility args
       end
 
       def is_divider?

data/lib/avo/dashboards/chartkick_card.rb

@@ -23,12 +23,11 @@ module Avo
       end
 
       def chartkick_options
-        card_height = 128
-        card_heading = 32
+        card_height = 144
+        card_heading = 40
 
         default = {
-          # figure our the available height for the chart.
-          # It's not ideal to work with magic numbers, I know.
+          # figure our the available height for the chart
           height: "#{(rows * card_height) - card_heading}px",
           colors: %w[#0B8AE2 #34C683 #2AB1EE #34C6A8],
           library: {
@@ -36,7 +35,7 @@ module Avo
             points: false,
             animation: true
           },
-          id: "#{parent.id}-#{rand(10_000..99_999)}"
+          id: "#{dashboard.id}-#{rand(10_000..99_999)}"
         }
 
         no_scale_options = {display: false}

data/lib/avo/fields/base_field.rb

@@ -54,7 +54,7 @@ module Avo
       class_attribute :item_type, default: :field
 
       def initialize(id, **args, &block)
-        # super(id, **args, &block)
+        super(id, **args, &block)
 
         @id = id
         @name = args[:name]
@@ -83,7 +83,11 @@ module Avo
         @computed = block.present?
         @computed_value = nil
 
-        initialize_visibility args
+        # Set the visibility
+        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(model: nil, resource: nil, action: nil, view: nil, panel_name: nil, user: nil)
@@ -108,14 +112,12 @@ module Avo
       # Secondly we'll try to find a translation key
       # We'll fallback to humanizing the id
       def name
-        default = @id.to_s.humanize(keep_id_suffix: true)
-
         return @name if custom_name?
 
         if translation_key && ::Avo::App.translation_enabled
-          t(translation_key, count: 1, default: default).capitalize
+          t(translation_key, count: 1, default: default_name).capitalize
         else
-          default
+          default_name
         end
       end
 
@@ -133,6 +135,10 @@ module Avo
         @name.present?
       end
 
+      def default_name
+        @id.to_s.humanize(keep_id_suffix: true)
+      end
+
       def placeholder
         return @placeholder if @placeholder.present?
 
@@ -154,7 +160,7 @@ module Avo
         final_value = @model.send(property) if (model_or_class(@model) == "model") && @model.respond_to?(property)
 
         # On new views and actions modals we need to prefill the fields
-        if (@view === :new) || @action.present?
+        if @view.in?([:new, :create]) || @action.present?
           if default.present?
             final_value = if default.respond_to?(:call)
               default.call

data/lib/avo/fields/date_field.rb

@@ -5,15 +5,13 @@ module Avo
       attr_reader :picker_format
       attr_reader :disable_mobile
       attr_reader :format
-      attr_reader :relative
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        add_string_prop args, :first_day_of_week, 0
+        add_string_prop args, :first_day_of_week, 1
         add_string_prop args, :picker_format, "Y-m-d"
         add_string_prop args, :format, "yyyy-LL-dd"
-        add_boolean_prop args, :relative
         add_boolean_prop args, :disable_mobile
       end
 

data/lib/avo/fields/field_extensions/has_include_blank.rb

@@ -4,7 +4,7 @@ module Avo
       module HasIncludeBlank
         def include_blank
           if @args[:include_blank] == true
-            placeholder || '—'
+            placeholder || "—"
           elsif @args[:include_blank] == false
             false
           else

data/lib/avo/fields/field_extensions/visible_in_different_views.rb

@@ -6,21 +6,12 @@ module Avo
         attr_accessor :show_on_show
         attr_accessor :show_on_new
         attr_accessor :show_on_edit
-        attr_accessor :show_on_dashboard
 
-        def initialize_visibility(args = {})
-        # def initialize(id = nil, **args, &block)
+        def initialize(id = nil, **args, &block)
           @show_on_index = @show_on_index.nil? ? true : @show_on_index
           @show_on_show = @show_on_show.nil? ? true : @show_on_show
           @show_on_new = @show_on_new.nil? ? true : @show_on_new
           @show_on_edit = @show_on_edit.nil? ? true : @show_on_edit
-          @show_on_dashboard = @show_on_dashboard.nil? ? true : @show_on_dashboard
-
-          # Set the visibility
-          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
 
         # Validates if the field is visible on certain view
@@ -91,7 +82,6 @@ module Avo
         end
 
         def show_on_all
-          @show_on_dashboard = true
           @show_on_index = true
           @show_on_show = true
           @show_on_edit = true
@@ -99,7 +89,6 @@ module Avo
         end
 
         def hide_on_all
-          @show_on_dashboard = false
           @show_on_index = false
           @show_on_show = false
           @show_on_edit = false

data/lib/avo/fields/has_base_field.rb

@@ -6,6 +6,7 @@ module Avo
       attr_accessor :attach_scope
       attr_accessor :description
       attr_accessor :discreet_pagination
+      attr_accessor :hide_search_input
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -14,7 +15,9 @@ module Avo
         @attach_scope = args[:attach_scope].present? ? args[:attach_scope] : nil
         @display = args[:display].present? ? args[:display] : :show
         @searchable = args[:searchable] == true
+        @hide_search_input = args[:hide_search_input] || false
         @description = args[:description]
+        @use_resource = args[:use_resource] || nil
         @discreet_pagination = args[:discreet_pagination] || false
       end
 
@@ -22,12 +25,16 @@ module Avo
         @searchable && ::Avo::App.license.has_with_trial(:searchable_associations)
       end
 
+      def use_resource
+        App.get_resource @use_resource
+      end
+
       def resource
         Avo::App.get_resource_by_model_name @model.class
       end
 
       def turbo_frame
-        "#{self.class.name.demodulize.to_s.underscore}_#{display}_#{id}"
+        "#{self.class.name.demodulize.to_s.underscore}_#{display}_#{frame_id}"
       end
 
       def frame_url
@@ -91,6 +98,16 @@ module Avo
           true
         end
       end
+
+      def default_name
+        use_resource&.name || super
+      end
+
+      private
+
+      def frame_id
+        use_resource.present? ? use_resource.route_key.to_sym : @id
+      end
     end
   end
 end