avo 2.11.3.pre.1 → 2.11.3.pre.2

data/app/controllers/avo/base_controller.rb

@@ -7,6 +7,7 @@ module Avo
     before_action :hydrate_resource
     before_action :set_applied_filters, only: :index
     before_action :set_model, only: [:show, :edit, :destroy, :update, :order]
+    before_action :hydrate_resource
     before_action :set_model_to_fill
     before_action :set_edit_title_and_breadcrumbs, only: [:edit, :update]
     before_action :fill_model, only: [:create, :update]
@@ -100,7 +101,7 @@ module Avo
 
     def new
       @model = @resource.model_class.new
-      @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
+      @resource = @resource.hydrate(model: @model, view: :new)
 
       set_actions
 
@@ -170,7 +171,7 @@ module Avo
     def update
       # model gets instantiated and filled in the fill_model method
       saved = save_model
-      @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
+      @resource = @resource.hydrate(model: @model, view: :edit)
 
       respond_to do |format|
         if saved
@@ -209,6 +210,9 @@ module Avo
       end
     end
 
+    def cards
+    end
+
     private
 
     def save_model
@@ -376,7 +380,7 @@ module Avo
     end
 
     def set_edit_title_and_breadcrumbs
-      @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
+      @resource = @resource.hydrate(model: @model, view: :edit)
       @page_title = @resource.default_panel_name.to_s
 
       last_crumb_args = {}

data/app/controllers/avo/cards_controller.rb

@@ -2,7 +2,12 @@ require_dependency "avo/application_controller"
 
 module Avo
   class CardsController < ApplicationController
-    before_action :set_dashboard, only: :show
+    before_action :set_dashboard
+    before_action :set_resource_name
+    before_action :set_resource, if: -> { @dashboard.blank? }
+    before_action :set_model, only: :show, if: -> { @resource.present? }
+    before_action :hydrate_resource, if: -> { @resource.present? }
+    before_action :set_parent, only: :show
     before_action :set_card, only: :show
 
     def show
@@ -10,15 +15,23 @@ module Avo
 
     private
 
+    def set_parent
+      @parent = @dashboard || @resource
+    end
+
     def set_dashboard
-      @dashboard = Avo::App.get_dashboard_by_id params[:dashboard_id]
+      return if params[:dashboard_id].blank?
+
+      @dashboard_class = Avo::App.get_dashboard_by_id params[:dashboard_id]
+
+      raise ActionController::RoutingError.new("Not Found") if @dashboard_class.nil? || @dashboard_class.is_hidden?
 
-      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
+      @dashboard = @dashboard_class.new
     end
 
     def set_card
-      @card = @dashboard.item_at_index(params[:index].to_i).tap do |card|
-        card.hydrate(dashboard: @dashboard, params: params)
+      @card = @parent.item_at_index(params[:index].to_i).tap do |card|
+        card.hydrate(parent: @parent, params: params)
       end
     end
   end

data/app/controllers/avo/dashboards_controller.rb

@@ -10,9 +10,11 @@ module Avo
     private
 
     def set_dashboard
-      @dashboard = Avo::App.get_dashboard_by_id params[:id]
+      @dashboard_class = Avo::App.get_dashboard_by_id params[:id]
 
-      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
+      raise ActionController::RoutingError.new("Not Found") if @dashboard_class.nil? || @dashboard_class.is_hidden?
+
+      @dashboard = @dashboard_class.new.hydrate(params: params) if @dashboard_class.present?
     end
   end
 end

data/app/javascript/js/controllers.js

@@ -5,9 +5,9 @@ import ActionsPickerController from './controllers/actions_picker_controller'
 import AttachmentsController from './controllers/attachments_controller'
 import BelongsToFieldController from './controllers/fields/belongs_to_field_controller'
 import BooleanFilterController from './controllers/boolean_filter_controller'
+import CardController from './controllers/card_controller'
 import CodeFieldController from './controllers/fields/code_field_controller'
 import CopyToClipboardController from './controllers/copy_to_clipboard_controller'
-import DashboardCardController from './controllers/dashboard_card_controller'
 import DateFieldController from './controllers/fields/date_field_controller'
 import FilterController from './controllers/filter_controller'
 import HiddenInputController from './controllers/hidden_input_controller'
@@ -38,8 +38,8 @@ application.register('action', ActionController)
 application.register('actions-picker', ActionsPickerController)
 application.register('attachments', AttachmentsController)
 application.register('boolean-filter', BooleanFilterController)
+application.register('card', CardController)
 application.register('copy-to-clipboard', CopyToClipboardController)
-application.register('dashboard-card', DashboardCardController)
 application.register('filter', FilterController)
 application.register('hidden-input', HiddenInputController)
 application.register('item-select-all', ItemSelectAllController)

data/app/views/avo/cards/_metric_card.html.erb

@@ -1,5 +1,5 @@
-<div class="flex mt-4 items-end">
+<div class="flex items-end text-gray-800">
   <span class="text-3xl"><%= @card.prefix %></span>
-  <span class="text-5xl"><%= @card.result_data %></span>
+  <span class="text-5xl font-semibold"><%= @card.result_data %></span>
   <span class="text-3xl"><%= @card.suffix %></span>
 </div>

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

@@ -1,24 +1,7 @@
 <%= render Avo::PanelComponent.new(title: @dashboard.name, description: @dashboard.description) do |c| %>
   <% c.bare_content do %>
-    <% 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>
+    <% if @dashboard.cards.present? %>
+      <%= render Avo::CardsListComponent.new parent: @dashboard %>
     <% else %>
       <div class="w-full h-full">
         <% if Rails.env.development? %>

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

@@ -9,7 +9,6 @@
   </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/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| %>
     <% c.tools do %>
-      <%= a_link('/admin', icon: 'arrow-left', color: :green, style: :primary, is_link: true) do %>
+      <%= a_link('/admin', icon: 'arrow-left', style: :primary, is_link: true) do %>
         Primary
       <% end %>
 

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

@@ -18,7 +18,7 @@
       <% end %>
     <% end %>
   </head>
-  <body class="bg-gray-25 os-mac">
+  <body class="bg-application os-mac">
     <div class="relative flex flex-1 w-full min-h-full" data-controller="sidebar" data-sidebar-open-value="<%= @sidebar_open %>">
       <div class="flex-1 flex flex-col max-w-full">
         <%= render partial: "avo/partials/navbar" %>

data/config/routes.rb

@@ -35,6 +35,9 @@ 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,10 +1,11 @@
 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
@@ -13,7 +14,7 @@ module Avo
     class_attribute :result_data
     class_attribute :query_block
 
-    attr_accessor :dashboard
+    attr_accessor :parent
     attr_accessor :options
     attr_accessor :index
     attr_accessor :params
@@ -26,8 +27,8 @@ module Avo
       end
     end
 
-    def initialize(dashboard:, options: {}, index: 0, cols: nil, rows: nil, label: nil, description: nil, refresh_every: nil)
-      @dashboard = dashboard
+    def initialize(parent:, options: {}, index: 0, cols: nil, rows: nil, label: nil, description: nil, refresh_every: nil, **args)
+      @parent = parent
       @options = options
       @index = index
       @cols = cols
@@ -35,6 +36,8 @@ module Avo
       @label = label
       @refresh_every = refresh_every
       @description = description
+
+      initialize_visibility args
     end
 
     def label
@@ -53,13 +56,21 @@ module Avo
     end
 
     def turbo_frame
-      "#{dashboard.id}_#{id}"
+      if parent_is_dashboard?
+        "#{parent.id}_#{id}"
+      elsif parent_is_resource?
+        "#{parent.id}_#{parent.model.id}_#{id}"
+      end
     end
 
     def frame_url(enforced_range: nil, params: {})
       enforced_range ||= initial_range || ranges.first
 
-      Avo::App.view_context.avo.dashboard_card_path(dashboard.id, id, turbo_frame: turbo_frame, index: index, range: enforced_range, **params.permit!)
+      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: {turbo_frame: turbo_frame, index: index, range: enforced_range, **params.permit!.to_h})
+      end
     end
 
     def card_classes
@@ -76,12 +87,12 @@ module Avo
       }
 
       classes_for_rows = {
-        1 => " h-36",
-        2 => " h-72",
-        3 => " h-[27rem]",
-        4 => " h-[36rem]",
-        5 => " h-[45rem]",
-        6 => " h-[54rem]"
+        1 => " min-h-[9rem] row-span-1",
+        2 => " min-h-[18rem] row-span-2",
+        3 => " min-h-[27rem] row-span-3",
+        4 => " min-h-[36rem] row-span-4",
+        5 => " min-h-[45rem] row-span-5",
+        6 => " min-h-[54rem] row-span-6"
       }
       # puts ["cols->", cols, classes_for_cols, classes_for_rows, classes_for_cols[cols.to_i]].inspect
 
@@ -98,15 +109,16 @@ module Avo
     end
 
     def compute_result
-      Avo::Hosts::DashboardCard.new(card: self, dashboard: dashboard, params: params, context: context, range: range, options: options)
+      Avo::Hosts::DashboardCard.new(card: self, parent: parent, params: params, context: context, range: range, options: options)
         .compute_result
 
       self
     end
 
-    def hydrate(dashboard: nil, params: nil)
-      @dashboard = dashboard if dashboard.present?
+    def hydrate(parent: nil, params: nil, view: nil)
+      @parent = parent if parent.present?
       @params = params if params.present?
+      @view = view if view.present?
 
       self
     end
@@ -135,12 +147,20 @@ module Avo
 
     private
 
-    def cols
-      @cols || self.class.cols
+    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?
     end
 
-    def rows
-      @rows || self.class.rows
+    def dashboard
+      parent if parent_is_dashboard?
     end
   end
 end

data/lib/avo/base_resource.rb

@@ -3,8 +3,9 @@ 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
 
@@ -439,9 +440,5 @@ 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_cards.rb

@@ -0,0 +1,88 @@
+module Avo
+  module Concerns
+    module HasCards
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :cards_holder
+        class_attribute :cards_index, default: 0
+        class_attribute :grid_cols, default: 3
+
+        delegate :item_at_index, to: :class
+
+        def cards
+          return [] if self.class.cards.blank?
+
+          view = self&.view
+
+          self.class.cards
+            .map do |card|
+              # Try to hydrate the card
+              card.hydrate(parent: self, params: params, view: view) if card.is_card?
+
+              card
+            end
+            .select do |card|
+              # If we don't get a view return all cards
+              return true if view.nil?
+
+              card.send("show_on_#{view}")
+            end
+        end
+      end
+
+      class_methods do
+        def card(klass, label: nil, description: nil, cols: nil, rows: nil, refresh_every: nil, options: {}, visible_on: nil, **args)
+          self.cards_holder ||= []
+
+          self.cards_holder << klass.new(
+            parent: self,
+            options: options,
+            index: cards_index,
+            label: label,
+            description: description,
+            cols: cols,
+            rows: rows,
+            refresh_every: refresh_every,
+            **args
+          )
+          self.cards_index += 1
+        end
+
+        def item_at_index(index)
+          cards.find do |item|
+            next if item.index.blank?
+
+            item.index == index
+          end
+        end
+
+        def divider(**args)
+          self.cards_holder ||= []
+
+          self.cards_holder << Avo::Dashboards::BaseDivider.new(**args)
+          self.cards_index += 1
+        end
+
+        def cards
+          self.cards_holder
+        end
+
+        def cards_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
+      end
+    end
+  end
+end

data/lib/avo/concerns/has_model.rb

@@ -0,0 +1,11 @@
+module Avo
+  module Concerns
+    module HasModel
+      extend ActiveSupport::Concern
+
+      def has_model_id?
+        model.present? && model.id.present?
+      end
+    end
+  end
+end

data/lib/avo/concerns/styles_cards.rb

@@ -0,0 +1,48 @@
+module Avo
+  module Concerns
+    module StylesCards
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :cols, default: 1
+        class_attribute :rows, default: 1
+
+        def card_classes
+          result = ""
+
+          # Writing down the classes so TailwindCSS knows not to purge them
+          classes_for_cols = {
+            1 => " sm:col-span-1",
+            2 => " sm:col-span-2",
+            3 => " sm:col-span-3",
+            4 => " sm:col-span-4",
+            5 => " sm:col-span-5",
+            6 => " sm:col-span-6"
+          }
+
+          classes_for_rows = {
+            1 => " sm:row-span-1 min-h-[8rem]",
+            2 => " sm:row-span-2 min-h-[16rem]",
+            3 => " sm:row-span-3 min-h-[24rem]",
+            4 => " sm:row-span-4 min-h-[32rem]",
+            5 => " sm:row-span-5 min-h-[40rem]",
+            6 => " sm:row-span-6 min-h-[48rem]",
+          }
+
+          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?
+
+          result
+        end
+
+        def cols
+          @cols || self.class.cols
+        end
+
+        def rows
+          @rows || self.class.rows
+        end
+      end
+    end
+  end
+end

data/lib/avo/dashboards/base_dashboard.rb

@@ -3,63 +3,18 @@ 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
 
-      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
+      attr_reader :view
+      attr_reader :params
 
+      class << self
         def navigation_label
           name
         end
@@ -84,6 +39,16 @@ 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,12 +5,16 @@ module Avo
       attr_reader :invisible
       attr_reader :index
 
+      include Avo::Fields::FieldExtensions::VisibleInDifferentViews
+
       class_attribute :id
 
-      def initialize(label: nil, invisible: false, index: nil)
+      def initialize(label: nil, invisible: false, index: nil, **args)
         @label = label
         @invisible = invisible
         @index = index
+
+        initialize_visibility args
       end
 
       def is_divider?

data/lib/avo/dashboards/chartkick_card.rb

@@ -23,8 +23,8 @@ module Avo
       end
 
       def chartkick_options
-        card_height = 144
-        card_heading = 40
+        card_height = 128
+        card_heading = 30
 
         default = {
           # figure our the available height for the chart
@@ -35,7 +35,7 @@ module Avo
             points: false,
             animation: true
           },
-          id: "#{dashboard.id}-#{rand(10_000..99_999)}"
+          id: "#{parent.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,11 +83,7 @@ module Avo
         @computed = block.present?
         @computed_value = nil
 
-        # 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?
+        initialize_visibility args
       end
 
       def hydrate(model: nil, resource: nil, action: nil, view: nil, panel_name: nil, user: nil)