avo 2.11.3.pre.3 → 2.12.0

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,7 +3,6 @@ module Avo
     extend ActiveSupport::DescendantsTracker
 
     include ActionView::Helpers::UrlHelper
-    include Avo::Concerns::HasCards
     include Avo::Concerns::HasModel
     include Avo::Concerns::HasFields
     include Avo::Concerns::HasStimulusControllers

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?
 

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

@@ -15,6 +15,7 @@ module Avo
         @display = args[:display].present? ? args[:display] : :show
         @searchable = args[:searchable] == true
         @description = args[:description]
+        @use_resource = args[:use_resource] || nil
         @discreet_pagination = args[:discreet_pagination] || false
       end
 
@@ -22,12 +23,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 +96,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

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/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.12.0" unless const_defined?(:VERSION)
 end

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/public/avo-assets/avo.css

@@ -6359,30 +6359,6 @@ trix-editor .attachment__metadata .attachment__size {
   grid-column:1 / -1
 }
 
-.row-span-1{
-  grid-row:span 1 / span 1
-}
-
-.row-span-2{
-  grid-row:span 2 / span 2
-}
-
-.row-span-3{
-  grid-row:span 3 / span 3
-}
-
-.row-span-4{
-  grid-row:span 4 / span 4
-}
-
-.row-span-5{
-  grid-row:span 5 / span 5
-}
-
-.row-span-6{
-  grid-row:span 6 / span 6
-}
-
 .float-right{
   float:right
 }
@@ -6579,10 +6555,6 @@ trix-editor .attachment__metadata .attachment__size {
   margin-top:1.5rem
 }
 
-.mb-6{
-  margin-bottom:1.5rem
-}
-
 .mr-px{
   margin-right:1px
 }
@@ -6635,6 +6607,30 @@ trix-editor .attachment__metadata .attachment__size {
   aspect-ratio:1 / 1
 }
 
+.h-36{
+  height:9rem
+}
+
+.h-72{
+  height:18rem
+}
+
+.h-\[27rem\]{
+  height:27rem
+}
+
+.h-\[36rem\]{
+  height:36rem
+}
+
+.h-\[45rem\]{
+  height:45rem
+}
+
+.h-\[54rem\]{
+  height:54rem
+}
+
 .h-5{
   height:1.25rem
 }
@@ -6699,30 +6695,6 @@ trix-editor .attachment__metadata .attachment__size {
   max-height:100%
 }
 
-.min-h-\[8rem\]{
-  min-height:8rem
-}
-
-.min-h-\[16rem\]{
-  min-height:16rem
-}
-
-.min-h-\[24rem\]{
-  min-height:24rem
-}
-
-.min-h-\[32rem\]{
-  min-height:32rem
-}
-
-.min-h-\[40rem\]{
-  min-height:40rem
-}
-
-.min-h-\[48rem\]{
-  min-height:48rem
-}
-
 .min-h-24{
   min-height:6rem
 }
@@ -7404,11 +7376,6 @@ trix-editor .attachment__metadata .attachment__size {
   background-color:rgb(21 128 61 / var(--tw-bg-opacity))
 }
 
-.bg-application{
-  --tw-bg-opacity:1;
-  background-color:rgb(246 246 247 / var(--tw-bg-opacity))
-}
-
 .bg-red-400{
   --tw-bg-opacity:1;
   background-color:rgb(248 113 113 / var(--tw-bg-opacity))
@@ -7439,6 +7406,11 @@ trix-editor .attachment__metadata .attachment__size {
   background-color:rgb(47 50 55 / var(--tw-bg-opacity))
 }
 
+.bg-application{
+  --tw-bg-opacity:1;
+  background-color:rgb(229 235 240 / var(--tw-bg-opacity))
+}
+
 .bg-gray-50{
   --tw-bg-opacity:1;
   background-color:rgb(241 242 243 / var(--tw-bg-opacity))
@@ -7922,11 +7894,6 @@ trix-editor .attachment__metadata .attachment__size {
   color:rgb(30 41 59 / var(--tw-text-opacity))
 }
 
-.text-gray-800{
-  --tw-text-opacity:1;
-  color:rgb(47 50 55 / var(--tw-text-opacity))
-}
-
 .text-red-600{
   --tw-text-opacity:1;
   color:rgb(220 38 38 / var(--tw-text-opacity))
@@ -7962,6 +7929,11 @@ trix-editor .attachment__metadata .attachment__size {
   color:rgb(51 65 85 / var(--tw-text-opacity))
 }
 
+.text-gray-800{
+  --tw-text-opacity:1;
+  color:rgb(47 50 55 / var(--tw-text-opacity))
+}
+
 .text-green-600{
   --tw-text-opacity:1;
   color:rgb(22 163 74 / var(--tw-text-opacity))
@@ -8880,30 +8852,6 @@ trix-editor {
     grid-column:span 6 / span 6
   }
 
-  .sm\:row-span-1{
-    grid-row:span 1 / span 1
-  }
-
-  .sm\:row-span-2{
-    grid-row:span 2 / span 2
-  }
-
-  .sm\:row-span-3{
-    grid-row:span 3 / span 3
-  }
-
-  .sm\:row-span-4{
-    grid-row:span 4 / span 4
-  }
-
-  .sm\:row-span-5{
-    grid-row:span 5 / span 5
-  }
-
-  .sm\:row-span-6{
-    grid-row:span 6 / span 6
-  }
-
   .sm\:block{
     display:block
   }