avo 2.1.1 → 2.1.2.pre1

data/app/components/avo/alert_component.html.erb

@@ -10,7 +10,7 @@
       </div>
       <div class="ml-3 w-0 flex-1 pt-0.5">
         <p class="text-sm leading-5 font-semibold">
-          <%= message %>
+          <%== message %>
         </p>
       </div>
       <div class="ml-4 flex-shrink-0 flex">

data/app/components/avo/alert_component.rb

@@ -18,7 +18,7 @@ class Avo::AlertComponent < ViewComponent::Base
   end
 
   def classes
-    result = "max-w-sm w-full shadow-lg rounded px-4 py-3 rounded relative border text-white pointer-events-auto"
+    result = "max-w-lg w-full shadow-lg rounded px-4 py-3 rounded relative border text-white pointer-events-auto"
 
     result += if is_error?
       " bg-red-400 border-red-700"

data/app/components/avo/card_component.html.erb

@@ -1,4 +1,9 @@
-<div class="relative flex-1 flex flex-col justify-between h-full" data-controller="dashboard-card" data-dashboard-card-target="card" data-refresh-every="<%= @card.refresh_every %>" data-card-id="<%= @card.id %>">
+<div class="relative flex-1 flex flex-col justify-between h-full"
+  data-controller="dashboard-card"
+  data-dashboard-card-target="card"
+  data-refresh-every="<%= @card.refresh_every %>"
+  data-card-id="<%= @card.id %>"
+  data-card-index="<%= @card.index %>">
   <% if @card.class.display_header %>
     <div class="px-4 pt-4">
       <div class="flex justify-between items-center min-h-6">
@@ -7,7 +12,7 @@
           </div>
         <div data-controller="select">
           <% if @card.type == :metric && @card.parsed_ranges.present? %>
-            <%= select_tag "#{@card.id}_range", options_for_select(@card.parsed_ranges, @card.range),
+            <%= select_tag "#{@card.id}_#{@card.index}_range", options_for_select(@card.parsed_ranges, @card.range),
               class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-sm text-blue-gray-700 disabled:text-blue-gray-700 leading-none rounded-md py-px px-2 leading-tight border outline-none outline w-24',
               data: {
                 target: 'select',

data/app/components/avo/panel_component.html.erb

@@ -19,9 +19,11 @@
         <% end %>
       </div>
 
-      <div class="flex-1 w-full flex flex-col sm:flex-row xl:justify-end sm:items-end space-y-2 sm:space-y-0 sm:space-x-2 mt-4 xl:mt-0">
-        <%= tools %>
-      </div>
+      <% if tools.present? %>
+        <div class="flex-1 w-full flex flex-col sm:flex-row xl:justify-end sm:items-end space-y-2 sm:space-y-0 sm:space-x-2 mt-4 xl:mt-0">
+          <%= tools %>
+        </div>
+      <% end %>
     </div>
   <% end %>
 

data/app/components/avo/sidebar_component.html.erb

@@ -43,6 +43,8 @@
             </div>
           </div>
         <% end %>
+
+        <%= render partial: "/avo/partials/sidebar_extra" %>
       </div>
     </div>
     <%= helpers.render_license_warnings %>

data/app/components/avo/views/resource_show_component.html.erb

@@ -84,4 +84,14 @@
       <% end %>
     <% end %>
   <% end %>
+
+  <% if should_display_invalid_fields_errors? %>
+    <turbo-stream action="append" target="alerts">
+      <template>
+        <% @resource.invalid_fields.each do |error| %>
+          <%= render Avo::AlertComponent.new :error, error[:message] %>
+        <% end %>
+      </template>
+    </turbo-stream>
+  <% end %>
 </div>

data/app/components/avo/views/resource_show_component.rb

@@ -90,4 +90,9 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
       end
     end
   end
+
+  # In development and test environments we shoudl show the invalid field errors
+  def should_display_invalid_fields_errors?
+    (Rails.env.development? || Rails.env.test?) && @resource.invalid_fields.present?
+  end
 end

data/app/controllers/avo/base_controller.rb

@@ -44,7 +44,7 @@ module Avo
         unless @index_params[:sort_by].eql? :created_at
           @query = @query.unscope(:order)
         end
-        @query = @query.order("#{@resource.model_class.table_name}.#{@index_params[:sort_by]} #{@index_params[:sort_direction]}")
+        @query = @query.order(Arel.sql("#{@resource.model_class.table_name}.#{@index_params[:sort_by]} #{@index_params[:sort_direction]}"))
       end
 
       # Apply filters
@@ -128,14 +128,7 @@ module Avo
 
       respond_to do |format|
         if saved
-          redirect_path = resource_path(model: @model, resource: @resource)
-
-          if params[:via_relation_class].present? && params[:via_resource_id].present?
-            parent_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class].safe_constantize
-            redirect_path = resource_path(model: params[:via_relation_class].safe_constantize, resource: parent_resource, resource_id: params[:via_resource_id])
-          end
-
-          format.html { redirect_to redirect_path, notice: "#{@model.class.name} #{t("avo.was_successfully_created")}." }
+          format.html { redirect_to after_create_path, notice: "#{@model.class.name} #{t("avo.was_successfully_created")}." }
         else
           flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :new, status: :unprocessable_entity }
@@ -153,7 +146,7 @@ module Avo
 
       respond_to do |format|
         if saved
-          format.html { redirect_to params[:referrer] || resource_path(model: @model, resource: @resource), notice: "#{@model.class.name} #{t("avo.was_successfully_updated")}." }
+          format.html { redirect_to after_update_path, notice: "#{@model.class.name} #{t("avo.was_successfully_updated")}." }
         else
           flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :edit, status: :unprocessable_entity }
@@ -357,5 +350,32 @@ module Avo
       add_breadcrumb @resource.model_title, resource_path(model: @resource.model, resource: @resource)
       add_breadcrumb t("avo.edit").humanize
     end
+
+    def after_create_path
+      # If this is an associated record return to the association show page
+      if params[:via_relation_class].present? && params[:via_resource_id].present?
+        parent_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class].safe_constantize
+
+        return resource_path(model: params[:via_relation_class].safe_constantize, resource: parent_resource, resource_id: params[:via_resource_id])
+      end
+
+      redirect_path_from_resource_option || resource_path(model: @model, resource: @resource)
+    end
+
+    def after_update_path
+      return params[:referrer] if params[:referrer].present?
+
+      redirect_path_from_resource_option || resource_path(model: @model, resource: @resource)
+    end
+
+    def redirect_path_from_resource_option
+      return nil if @resource.class.after_update_path.blank?
+
+      if @resource.class.after_create_path == :index
+        resources_path(resource: @resource)
+      else
+        resource_path(model: @model, resource: @resource)
+      end
+    end
   end
 end

data/app/controllers/avo/dashboards_controller.rb

@@ -8,11 +8,7 @@ module Avo
     end
 
     def card
-      @card = @dashboard.items.find do |item|
-        next unless item.is_card?
-
-        item.id.to_s == params[:card_id]
-      end.tap do |card|
+      @card = @dashboard.item_at_index(params[:index].to_i).tap do |card|
         card.hydrate(dashboard: @dashboard, params: params)
       end
     end

data/app/helpers/avo/url_helpers.rb

@@ -12,8 +12,12 @@ module Avo
         end
       end
 
-      # This entry uses `route_key` instead of `model_key` because it's rails that needs `fish_index` to build the correct path
-      avo.send :"resources_#{resource.route_key}_path", **existing_params, **args
+      # Create the `route_key` from the model key so the namespaced models get the proper path (SomeModule::Post -> some_module_post).
+      # Add the `_index` suffix for the uncountable models so they get the correct path (`fish_index`)
+      route_key = resource.model_key
+      route_key << "_index" if resource.model_name.singular == resource.model_name.plural
+
+      avo.send :"resources_#{route_key}_path", **existing_params, **args
     end
 
     def resource_path(

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

@@ -8,7 +8,10 @@
               <%= 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) %>">
+                <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 %>

data/lib/avo/base_action.rb

@@ -13,6 +13,7 @@ module Avo
     class_attribute :user
     class_attribute :resource
     class_attribute :fields
+    class_attribute :invalid_fields
     class_attribute :standalone, default: false
     class_attribute :visible
     class_attribute :may_download_file, default: false

data/lib/avo/base_card.rb

@@ -0,0 +1,175 @@
+module Avo
+  class BaseCard
+    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
+    class_attribute :display_header, default: true
+    # private
+    class_attribute :result_data
+    class_attribute :query_block
+
+    attr_accessor :dashboard
+    attr_accessor :options
+    attr_accessor :index
+    attr_accessor :params
+
+    delegate :context, to: ::Avo::App
+
+    class << self
+      def query(&block)
+        self.query_block = block
+      end
+    end
+
+    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
+      @rows = rows
+      @label = label
+      @refresh_every = refresh_every
+      @description = description
+    end
+
+    def label
+      return @label.to_s if @label.present?
+      return self.class.label.to_s if self.class.label.present?
+
+      self.class.id.to_s.humanize
+    end
+
+    def description
+      @description || self.class.description
+    end
+
+    def refresh_every
+      @refresh_every || self.class.refresh_every
+    end
+
+    def translated_range(range)
+      return "#{range} days" if range.is_a? Integer
+
+      case range
+      when "MTD"
+        "Month to date"
+      when "QTD"
+        "Quarter to date"
+      when "YTD"
+        "Year to date"
+      when "TODAY"
+        "Today"
+      else
+        range
+      end
+    end
+
+    def parsed_ranges
+      return unless ranges.present?
+
+      ranges.map { |range| [translated_range(range), range] }
+    end
+
+    def turbo_frame
+      "#{dashboard.id}_#{id}"
+    end
+
+    def frame_url(enforced_range: nil, params: {})
+      enforced_range ||= initial_range || ranges.first
+
+      # append the parent params to the card request
+      begin
+        other_params = "&#{params.permit!.to_h.map { |k, v| "#{k}=#{v}" }.join("&")}"
+      rescue
+      end
+
+      "#{Avo::App.root_path}/dashboards/#{dashboard.id}/cards/#{id}?turbo_frame=#{turbo_frame}&index=#{index}&range=#{enforced_range}#{other_params}"
+    end
+
+    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 => " 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?
+
+      result
+    end
+
+    def type
+      return :metric if self.class.superclass == ::Avo::Dashboards::MetricCard
+      return :chartkick if self.class.superclass == ::Avo::Dashboards::ChartkickCard
+      return :partial if self.class.superclass == ::Avo::Dashboards::PartialCard
+    end
+
+    def compute_result
+      Avo::Hosts::DashboardCard.new(card: self, dashboard: dashboard, params: params, context: context, range: range, options: options)
+        .compute_result
+
+      self
+    end
+
+    def hydrate(dashboard: nil, params: nil)
+      @dashboard = dashboard if dashboard.present?
+      @params = params if params.present?
+
+      self
+    end
+
+    def range
+      return params[:range] if params.dig(:range).present?
+
+      return initial_range if initial_range.present?
+
+      ranges.first
+    end
+
+    def result(data)
+      self.result_data = data
+
+      self
+    end
+
+    def is_card?
+      true
+    end
+
+    def is_divider?
+      false
+    end
+
+    private
+
+    def cols
+      @cols || self.class.cols
+    end
+
+    def rows
+      @rows || self.class.rows
+    end
+  end
+end

data/lib/avo/base_resource.rb

@@ -40,6 +40,9 @@ module Avo
     class_attribute :resolve_find_scope
     class_attribute :ordering
     class_attribute :hide_from_global_search, default: false
+    class_attribute :after_create_path, default: :show
+    class_attribute :after_update_path, default: :show
+    class_attribute :invalid_fields
 
     class << self
       delegate :t, to: ::I18n
@@ -427,11 +430,15 @@ module Avo
     # This is used as the model class ID
     # We use this instead of the route_key to maintain compatibility with uncountable models
     # With uncountable models route key appends an _index suffix (Fish->fish_index)
-    # Example: User->users, MediaItem->medie_items, Fish->fish
+    # Example: User->users, MediaItem->media_items, Fish->fish
     def model_key
       model_class.model_name.plural
     end
 
+    def model_name
+      model_class.model_name
+    end
+
     def singular_model_key
       model_class.model_name.singular
     end

data/lib/avo/dashboards/base_dashboard.rb

@@ -9,12 +9,30 @@ module Avo
       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)
+        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)
+          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)

data/lib/avo/dashboards/base_divider.rb

@@ -3,12 +3,14 @@ module Avo
     class BaseDivider
       attr_reader :label
       attr_reader :invisible
+      attr_reader :index
 
       class_attribute :id
 
-      def initialize(label: nil, invisible: false)
+      def initialize(label: nil, invisible: false, index: nil)
         @label = label
         @invisible = invisible
+        @index = index
       end
 
       def is_divider?

data/lib/avo/dashboards/dashboard_card.rb

@@ -0,0 +1,6 @@
+module Avo
+  module Dashboards
+    class DashboardCard < Avo::BaseCard
+    end
+  end
+end

data/lib/avo/dashboards/partial_card.rb

@@ -1,6 +1,6 @@
 module Avo
   module Dashboards
-    class PartialCard < BaseCard
+    class PartialCard < Avo::BaseCard
       class_attribute :partial
     end
   end

data/lib/avo/fields/base_field.rb

@@ -104,7 +104,7 @@ module Avo
 
         return @name if @name.present?
 
-        return t(translation_key, count: 1, default: default).capitalize if @translation_key
+        return t(translation_key, count: 1, default: default).capitalize if translation_key
 
         default
       end
@@ -112,7 +112,7 @@ module Avo
       def plural_name
         default = name.pluralize
 
-        return t(translation_key, count: 2, default: default).capitalize if @translation_key
+        return t(translation_key, count: 2, default: default).capitalize if translation_key
 
         default
       end

data/lib/avo/fields/date_field.rb

@@ -19,7 +19,7 @@ module Avo
         return if value.blank?
 
         if @format.is_a?(Symbol)
-          value.to_s(@format)
+          value.to_formatted_s(@format)
         else
           value.strftime(@format)
         end

data/lib/avo/fields_collector.rb

@@ -2,14 +2,19 @@ module Avo
   module FieldsCollector
     def field(field_name, as:, **args, &block)
       self.fields ||= []
+      self.invalid_fields ||= []
 
       field_instance = parse_field(field_name, as: as, **args, &block)
 
       if field_instance.present?
         self.fields << field_instance
       else
-        message = "[Avo] The #{field_name} field, as: #{as} from #{self.name} has an invalid configuration."
-        ::Rails.logger.warn message
+        self.invalid_fields << ({
+          name: field_name,
+          as: as,
+          resource: name,
+          message: "There's an invalid field configuration for this resource. <br/> <code class='px-1 py-px rounded bg-red-600'>field :#{field_name}, as: #{as}</code>"
+        })
       end
     end
 

data/lib/avo/hosts/dashboard_card.rb

@@ -10,6 +10,7 @@ module Avo
       option :dashboard
       option :card
       option :params
+      option :options
 
       delegate :result, to: :card
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.1.1"
+  VERSION = "2.1.2.pre1"
 end

data/public/avo-assets/avo.css

@@ -6685,8 +6685,8 @@ progress[value]::-moz-progress-bar{
   max-width:100%
 }
 
-.max-w-sm{
-  max-width:24rem
+.max-w-lg{
+  max-width:32rem
 }
 
 .max-w-xs{
@@ -7174,6 +7174,11 @@ progress[value]::-moz-progress-bar{
   border-color:rgb(87 93 102 / var(--tw-border-opacity))
 }
 
+.bg-red-600{
+  --tw-bg-opacity:1;
+  background-color:rgb(220 38 38 / var(--tw-bg-opacity))
+}
+
 .bg-white{
   --tw-bg-opacity:1;
   background-color:rgb(255 255 255 / var(--tw-bg-opacity))
@@ -7291,6 +7296,16 @@ progress[value]::-moz-progress-bar{
   padding:0.25rem
 }
 
+.px-1{
+  padding-left:0.25rem;
+  padding-right:0.25rem
+}
+
+.py-px{
+  padding-top:1px;
+  padding-bottom:1px
+}
+
 .px-2{
   padding-left:0.5rem;
   padding-right:0.5rem
@@ -7356,21 +7371,11 @@ progress[value]::-moz-progress-bar{
   padding-bottom:0px
 }
 
-.px-1{
-  padding-left:0.25rem;
-  padding-right:0.25rem
-}
-
 .py-4{
   padding-top:1rem;
   padding-bottom:1rem
 }
 
-.py-px{
-  padding-top:1px;
-  padding-bottom:1px
-}
-
 .py-24{
   padding-top:6rem;
   padding-bottom:6rem

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2.pre1
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,6 +234,9 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- app/assets/builds/avo.css
+- app/assets/builds/avo.js
+- app/assets/builds/avo.js.map
 - app/assets/config/avo_manifest.js
 - app/assets/stylesheets/avo.css
 - app/assets/stylesheets/css/active-storage.css
@@ -1085,6 +1088,7 @@ files:
 - app/views/avo/partials/_navbar.html.erb
 - app/views/avo/partials/_resource_search.html.erb
 - app/views/avo/partials/_scripts.html.erb
+- app/views/avo/partials/_sidebar_extra.html.erb
 - app/views/avo/partials/_sortable_component.html.erb
 - app/views/avo/partials/_table_header.html.erb
 - app/views/avo/partials/_view_toggle_button.html.erb
@@ -1120,12 +1124,13 @@ files:
 - lib/avo/action_model.rb
 - lib/avo/app.rb
 - lib/avo/base_action.rb
+- lib/avo/base_card.rb
 - lib/avo/base_resource.rb
 - lib/avo/configuration.rb
-- lib/avo/dashboards/base_card.rb
 - lib/avo/dashboards/base_dashboard.rb
 - lib/avo/dashboards/base_divider.rb
 - lib/avo/dashboards/chartkick_card.rb
+- lib/avo/dashboards/dashboard_card.rb
 - lib/avo/dashboards/metric_card.rb
 - lib/avo/dashboards/partial_card.rb
 - lib/avo/dynamic_router.rb
@@ -1280,9 +1285,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.3
 signing_key: