avo 2.17.1.pre.3 → 2.17.1.pre.5.stackedlayout

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

@@ -25,8 +25,11 @@
   <% end %>
   <% if body? %>
     <div class="flex flex-col sm:flex-row space-y-4 sm:space-y-0 sm:gap-4 w-full">
-      <div class="relative flex-1 overflow-auto <%= white_panel_classes %> <%= @body_classes %> <% if sidebar? %> w-2/3 <% end %>">
-        <%= body %>
+      <div class="relative flex-1 <% if sidebar? %> w-2/3 <% else %> w-full <% end %>">
+        <% # The body is wrapped inside another div in order to avoid long & tall panels next to sidebars when the sidebar taller. %>
+        <div class="relative <%= white_panel_classes %> <%= @body_classes %>">
+          <%= body %>
+        </div>
       </div>
       <% if sidebar? %>
         <div class="w-full sm:w-1/3 flex-shrink-0 h-full <%= white_panel_classes %>">

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

@@ -1,6 +1,8 @@
 <%= content_tag :div,
   data: {
-    'model-id': @resource.model.id,
+    model_name: @resource.model_name.to_s,
+    resource_name: @resource.class.to_s,
+    model_id: @resource.model.id,
     selected_resources_name: @resource.model_key,
     selected_resources: [@resource.model.id],
     **@resource.stimulus_data_attributes

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

@@ -1,5 +1,7 @@
 <%= content_tag :div,
   data: {
+    model_name: @resource.model_name.to_s,
+    resource_name: @resource.class.to_s,
     **@resource.stimulus_data_attributes
   } do %>
   <%= render Avo::PanelComponent.new(name: title, description: description, data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
@@ -46,10 +48,8 @@
       </div>
       <% if view_type.to_sym == :table %>
         <% if @resources.present? %>
-          <div class="w-full overflow-auto flex flex-col mt-0 mac-styled-scrollbar">
-            <div class="relative flex-1 flex">
-              <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
-            </div>
+          <div class="w-full relative flex-1 flex mt-0">
+            <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
           </div>
         <% else %>
           <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: view_type, add_background: true %>

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

@@ -1,6 +1,8 @@
 <%= content_tag :div,
   data: {
-    'model-id': @resource.model.id,
+    model_name: @resource.model_name.to_s,
+    resource_name: @resource.class.to_s,
+    model_id: @resource.model.id,
     selected_resources_name: @resource.model_key,
     selected_resources: [@resource.model.id],
     **@resource.stimulus_data_attributes
@@ -154,7 +156,8 @@
     <% end %>
     <% if main_panel.present? %>
       <% c.body do %>
-        <div class="divide-y">
+        <%# the overflow helps with long values %>
+        <div class="divide-y overflow-auto">
           <% main_panel.items.each_with_index do |field, index| %>
             <%= render field
               .hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view)

data/app/controllers/avo/actions_controller.rb

@@ -12,7 +12,10 @@ module Avo
     before_action :set_action, only: [:show, :handle]
 
     def show
-      @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
+      # Se the view to :new so the default value gets prefilled
+      @view = :new
+
+      @resource.hydrate(model: @model, view: @view, user: _current_user, params: params)
       @model = ActionModel.new @action.get_attributes_for_action
     end
 
@@ -48,17 +51,15 @@ module Avo
     end
 
     def set_action
-      @action = action_class.new(model: @model, resource: @resource, user: _current_user, view: :edit)
+      @action = action_class.new(model: @model, resource: @resource, user: _current_user, view: @view)
     end
 
     def action_class
       klass_name = params[:action_id].gsub("avo_actions_", "").camelize
 
-      valid_klass = Avo::BaseAction.descendants.find do |action|
+      Avo::BaseAction.descendants.find do |action|
         action.to_s == klass_name
       end
-
-      valid_klass
     end
 
     def respond(response)

data/app/controllers/avo/application_controller.rb

@@ -1,11 +1,5 @@
 module Avo
   class ApplicationController < ::ActionController::Base
-    if defined?(Pundit::Authorization)
-      include Pundit::Authorization
-    else
-      include Pundit
-    end
-
     include Pagy::Backend
     include Avo::ApplicationHelper
     include Avo::UrlHelpers
@@ -24,7 +18,7 @@ module Avo
     before_action :set_view
     before_action :set_sidebar_open
 
-    rescue_from Pundit::NotAuthorizedError, with: :render_unauthorized
+    rescue_from Avo::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
 
     helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?, :resource_view_path
@@ -257,18 +251,16 @@ module Avo
       instance_eval(&Avo.configuration.authenticate)
     end
 
-    def render_unauthorized(exception)
-      if !exception.is_a? Pundit::NotDefinedError
-        flash.now[:notice] = t "avo.not_authorized"
-
-        redirect_url = if request.referrer.blank? || (request.referrer == request.url)
-          root_url
-        else
-          request.referrer
-        end
+    def render_unauthorized(_exception)
+      flash.now[:notice] = t "avo.not_authorized"
 
-        redirect_to(redirect_url)
+      redirect_url = if request.referrer.blank? || (request.referrer == request.url)
+        root_url
+      else
+        request.referrer
       end
+
+      redirect_to(redirect_url)
     end
 
     def set_authorization

data/app/controllers/avo/associations_controller.rb

@@ -157,7 +157,7 @@ module Avo
     private
 
     def set_related_authorization
-      @authorization = if related_resource
+      @related_authorization = if related_resource
         related_resource.authorization(user: _current_user)
       else
         Services::AuthorizationService.new _current_user

data/app/controllers/avo/cards_controller.rb

@@ -2,10 +2,12 @@ require_dependency "avo/application_controller"
 
 module Avo
   class CardsController < ApplicationController
-    before_action :set_dashboard, only: :show
-    before_action :set_card, only: :show
+    before_action :set_dashboard
+    before_action :set_card
+    before_action :detect_chartkick
 
     def show
+      render(:chartkick_missing) unless @chartkick_installed
     end
 
     private
@@ -21,5 +23,13 @@ module Avo
         card.hydrate(dashboard: @dashboard, params: params)
       end
     end
+
+    def detect_chartkick
+      @chartkick_installed = if @card.class.ancestors.map(&:to_s).include?("Avo::Dashboards::ChartkickCard")
+        defined?(Chartkick)
+      else
+        true
+      end
+    end
   end
 end

data/app/javascript/js/controllers/fields/date_field_controller.js

@@ -60,6 +60,22 @@ export default class extends Controller {
     return this.viewValue === 'show'
   }
 
+  get fieldIsDate() {
+    return this.fieldTypeValue === 'date'
+  }
+
+  get fieldIsDateTime() {
+    return this.fieldTypeValue === 'dateTime'
+  }
+
+  get fieldIsTime() {
+    return this.fieldTypeValue === 'time'
+  }
+
+  get fieldHasTime() {
+    return this.fieldIsTime || this.fieldIsDateTime
+  }
+
   // Parse the time as if it were UTC
   get parsedValue() {
     return DateTime.fromISO(this.initialValue, { zone: 'UTC' })
@@ -98,7 +114,7 @@ export default class extends Controller {
     let value = this.parsedValue
 
     // Set the zone only if the type of field is date time or relative time.
-    if (this.enableTimeValue && this.relativeValue) {
+    if (this.fieldHasTime && this.relativeValue) {
       value = value.setZone(this.displayTimezone)
     }
 
@@ -136,16 +152,22 @@ export default class extends Controller {
     // Hide calendar and only keep time picker.
     options.noCalendar = this.noCalendarValue
 
+    if (this.fieldHasTime) {
+      options.dateFormat = 'Y-m-d H:i:S'
+    }
+
     if (this.initialValue) {
-      // Enable timezone display
-      if (this.enableTimeValue && this.relativeValue) {
-        options.defaultDate = this.parsedValue.setZone(this.displayTimezone).toISO()
-
-        options.dateFormat = 'Y-m-d H:i:S'
-      } else {
-        // Because the browser treats the date like a timestamp and updates it at 00:00 hour, when on a western timezone the date will be converted with one day offset.
-        // Ex: 2022-01-30 will render as 2022-01-29 on an American timezone
-        options.defaultDate = universalTimestamp(this.initialValue)
+      switch (this.fieldTypeValue) {
+        case 'date':
+          options.defaultDate = universalTimestamp(this.initialValue)
+          break
+        default:
+        case 'time':
+          options.defaultDate = this.parsedValue.setZone(this.displayTimezone, { keepLocalTime: !this.relativeValue }).toISO()
+          break
+        case 'dateTime':
+          options.defaultDate = this.parsedValue.setZone(this.displayTimezone, { keepLocalTime: !this.relativeValue }).toISO()
+          break
       }
     }
 
@@ -182,27 +204,18 @@ export default class extends Controller {
       return
     }
 
-    let args = {}
-
-    // For values that involve time we should keep the local time.
-    if (this.timezoneValue || !this.relativeValue) {
-      args = { keepLocalTime: true }
-    } else {
-      args = { keepLocalTime: false }
-    }
-
     let value
     switch (this.fieldTypeValue) {
       case 'time':
         // For time values, we should maintain the real value and format it to a time-friendly format.
-        value = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', args).toFormat(RAW_TIME_FORMAT)
+        value = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: !this.relativeValue }).toFormat(RAW_TIME_FORMAT)
         break
       case 'date':
         value = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: true }).toFormat(RAW_DATE_FORMAT)
         break
       default:
       case 'dateTime':
-        value = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', args).toISO()
+        value = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: !this.relativeValue }).toISO()
         break
     }
 

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

@@ -27,7 +27,7 @@
           <% @action.get_fields.each_with_index do |field, index| %>
             <%= render field
               .hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: @view)
-              .component_for_view(:edit)
+              .component_for_view(@view)
               .new(field: field, resource: @resource, index: index, form: form, compact: true)
             %>
           <% end %>

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

@@ -0,0 +1,14 @@
+<%= render Avo::TurboFrameWrapperComponent.new(params[:turbo_frame]) do %>
+  <div class="w-full h-full flex items-center text-center">
+    <div class="flex-1">
+      Chartkick is missing.
+      <a
+        href="https://docs.avohq.io/2.0/upgrade.html#upgrade-from-2-17-to-2-18"
+        target="_blank"
+      >
+        Manually require it in your
+        <code class="inline">Gemfile</code>
+      </a>.
+    </div>
+  </div>
+<% end %>

data/avo.gemspec

@@ -32,20 +32,17 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
 
-  spec.add_dependency "rails", ">= 6.0"
+  spec.add_dependency "activerecord", ">= 6.0"
+  spec.add_dependency "actionview", ">= 6.0"
   spec.add_dependency "pagy"
   spec.add_dependency "zeitwerk"
-  spec.add_dependency "countries"
-  spec.add_dependency "pundit"
   spec.add_dependency "httparty"
   spec.add_dependency "active_link_to"
-  spec.add_dependency "image_processing"
   spec.add_dependency "view_component"
   spec.add_dependency "turbo-rails"
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
   spec.add_dependency "breadcrumbs_on_rails"
-  spec.add_dependency "chartkick"
   spec.add_dependency "dry-initializer"
   spec.add_dependency "docile"
   spec.add_dependency "inline_svg"

data/db/factories.rb

@@ -90,10 +90,10 @@ FactoryBot.define do
   end
 
   factory :product do
-    title { "MyString" }
-    description { "MyText" }
-    price { 1 }
-    status { "MyString" }
-    category { "MyString" }
+    title { Faker::App.name }
+    description { Faker::Lorem.paragraphs(number: rand(1...3)).join("\n") }
+    price { rand(10000..999000) }
+    status { "status" }
+    category { ::Product.categories.values.sample }
   end
 end

data/lib/avo/base_action.rb

@@ -72,7 +72,7 @@ module Avo
 
     def get_attributes_for_action
       get_fields.map do |field|
-        [field.id, field.value]
+        [field.id, field.value || field.default]
       end.to_h
     end
 

data/lib/avo/base_resource.rb

@@ -4,6 +4,7 @@ module Avo
 
     include ActionView::Helpers::UrlHelper
     include Avo::Concerns::HasFields
+    include Avo::Concerns::CanReplaceFields
     include Avo::Concerns::HasEditableControls
     include Avo::Concerns::HasStimulusControllers
     include Avo::Concerns::ModelClassConstantized

data/lib/avo/concerns/can_replace_fields.rb

@@ -0,0 +1,36 @@
+module Avo
+  module Concerns
+    module CanReplaceFields
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :backup_items_holder
+      end
+
+      class_methods do
+        def with_temporary_items(&block)
+          # back-up the previous items
+          self.backup_items_holder = items_holder
+
+          self.items_holder = Avo::ItemsHolder.new
+
+          instance_eval(&block)
+        end
+
+        def restore_items_from_backup
+          self.items_holder = backup_items_holder if backup_items_holder.present?
+        end
+
+        def with_new_items(&block)
+          self.items_holder = Avo::ItemsHolder.new
+
+          instance_eval(&block)
+        end
+      end
+
+      def with_new_items(&block)
+        self.class.with_new_items(&block)
+      end
+    end
+  end
+end

data/lib/avo/configuration.rb

@@ -37,6 +37,8 @@ module Avo
     attr_accessor :model_resource_mapping
     attr_accessor :tabs_style
     attr_accessor :resource_default_view
+    attr_accessor :authorization_client
+    attr_accessor :field_wrapper_layout
     attr_writer :branding
 
     def initialize
@@ -85,6 +87,8 @@ module Avo
       @model_resource_mapping = {}
       @tabs_style = :tabs
       @resource_default_view = :show
+      @authorization_client = :pundit
+      @field_wrapper_layout = :inline
     end
 
     def current_user_method(&block)

data/lib/avo/engine.rb

@@ -1,6 +1,15 @@
 # requires all dependencies
 Gem.loaded_specs["avo"].dependencies.each do |d|
-  require d.name
+  case d.name
+  when "activerecord"
+    require "active_record/railtie"
+  when "actionview"
+    require "action_view/railtie"
+  when "activestorage"
+    require "active_storage/engine"
+  else
+    require d.name
+  end
 end
 
 # In development we should load the engine so we get the autoload for components

data/lib/avo/fields/base_field.rb

@@ -36,6 +36,7 @@ module Avo
       attr_reader :as_avatar
       attr_reader :as_description
       attr_reader :index_text_align
+      attr_reader :stacked
 
       # Private options
       attr_reader :updatable
@@ -78,6 +79,7 @@ module Avo
         @html = args[:html] || nil
         @view = args[:view] || nil
         @value = args[:value] || nil
+        @stacked = args[:stacked] || nil
 
         @args = args
 

data/lib/avo/fields/country_field.rb

@@ -11,7 +11,11 @@ module Avo
 
         super(id, **args, &block)
 
-        @countries = ISO3166::Country.translations.sort_by { |code, name| name }.to_h
+        @countries = begin
+          ISO3166::Country.translations.sort_by { |code, name| name }.to_h
+        rescue
+          {none: "You need to install the countries gem for this field to work properly"}
+        end
         @display_code = args[:display_code].present? ? args[:display_code] : false
       end
 

data/lib/avo/fields/date_time_field.rb

@@ -5,6 +5,7 @@ module Avo
       attr_reader :picker_format
       attr_reader :time_24hr
       attr_reader :timezone
+      attr_reader :relative
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -13,6 +14,7 @@ module Avo
         add_string_prop args, :picker_format, "Y-m-d H:i:S"
         add_string_prop args, :format, "yyyy-LL-dd TT"
         add_string_prop args, :timezone
+        add_boolean_prop args, :relative, true
       end
 
       def formatted_value

data/lib/avo/fields/time_field.rb

@@ -1,20 +1,14 @@
 module Avo
   module Fields
-    class TimeField < DateField
+    class TimeField < DateTimeField
       attr_reader :format
       attr_reader :picker_format
-      attr_reader :time_24hr
-      attr_reader :timezone
-      attr_reader :relative
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        add_boolean_prop args, :time_24hr
         add_string_prop args, :picker_format, "H:i:S"
         add_string_prop args, :format, "TT"
-        add_string_prop args, :timezone
-        add_boolean_prop args, :relative, true
       end
 
       def formatted_value

data/lib/avo/html/builder.rb

@@ -13,6 +13,8 @@ class Avo::HTML::Builder
   attr_accessor :edit_stack
   attr_accessor :index_stack
   attr_accessor :input_stack
+  attr_accessor :label_stack
+  attr_accessor :content_stack
 
   attr_accessor :record
   attr_accessor :resource
@@ -30,6 +32,8 @@ class Avo::HTML::Builder
     @edit_stack = {}
     @index_stack = {}
     @input_stack = {}
+    @label_stack = {}
+    @content_stack = {}
 
     @record = record
     @resource = resource
@@ -77,6 +81,16 @@ class Avo::HTML::Builder
     capture_block :input, &block
   end
 
+  # Takes a block
+  def label(&block)
+    capture_block :label, &block
+  end
+
+  # Takes a block
+  def content(&block)
+    capture_block :content, &block
+  end
+
   # Takes a block
   def show(&block)
     capture_block :show, &block

data/lib/avo/services/authorization_clients/pundit_client.rb

@@ -0,0 +1,51 @@
+module Avo
+  module Services
+    module AuthorizationClients
+      class PunditClient
+        def authorize(user, record, action, policy_class: nil)
+          Pundit.authorize(user, record, action, policy_class: policy_class)
+        rescue Pundit::NotDefinedError => error
+          raise NoPolicyError.new error.message
+        rescue Pundit::NotAuthorizedError => error
+          raise NotAuthorizedError.new error.message
+        end
+
+        def policy(user, record)
+          Pundit.policy(user, record)
+        end
+
+        def policy!(user, record)
+          Pundit.policy!(user, record)
+        rescue Pundit::NotDefinedError => error
+          raise NoPolicyError.new error.message
+        end
+
+        def apply_policy(user, model, policy_class: nil)
+          # Try and figure out the scope from a given policy or auto-detected one
+          scope_from_policy_class = scope_for_policy_class(policy_class)
+
+          # If we discover one use it.
+          # Else fallback to pundit.
+          if scope_from_policy_class.present?
+            scope_from_policy_class.new(user, model).resolve
+          else
+            Pundit.policy_scope!(user, model)
+          end
+        rescue Pundit::NotDefinedError => error
+          raise NoPolicyError.new error.message
+        end
+
+        private
+
+        # Fetches the scope for a given policy
+        def scope_for_policy_class(policy_class = nil)
+          return if policy_class.blank?
+
+          if policy_class.present? && defined?(policy_class::Scope)
+            policy_class::Scope
+          end
+        end
+      end
+    end
+  end
+end