avo 2.17.1.pre.4.issue.1342 → 2.17.1.pre.5.stackedlayout

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,7 +48,7 @@
       </div>
       <% if view_type.to_sym == :table %>
         <% if @resources.present? %>
-          <div class="w-full relative flex-1 flex mac-styled-scrollbar overflow-auto mt-0">
+          <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 %>

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/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

@@ -72,6 +72,10 @@ export default class extends Controller {
     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' })
@@ -110,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)
     }
 
@@ -148,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
       }
     }
 
@@ -194,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/concerns/has_fields.rb

@@ -10,8 +10,6 @@ module Avo
         class_attribute :tabs_tabs_holder
         class_attribute :raw_tabs
         class_attribute :tools_holder
-
-        class_attribute :backup_items_holder
       end
 
       class_methods do
@@ -105,25 +103,6 @@ module Avo
           end
         end
 
-        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
-
         private
 
         def extract_fields_from_items(thing)
@@ -332,10 +311,6 @@ module Avo
         [main_panel, *panelfull_items]
       end
 
-      def with_new_items(&block)
-        self.class.with_new_items(&block)
-      end
-
       private
 
       def check_license

data/lib/avo/configuration.rb

@@ -38,6 +38,7 @@ module Avo
     attr_accessor :tabs_style
     attr_accessor :resource_default_view
     attr_accessor :authorization_client
+    attr_accessor :field_wrapper_layout
     attr_writer :branding
 
     def initialize
@@ -86,7 +87,8 @@ module Avo
       @model_resource_mapping = {}
       @tabs_style = :tabs
       @resource_default_view = :show
-      @authorization_client = nil
+      @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/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

@@ -4,10 +4,10 @@ module Avo
       class PunditClient
         def authorize(user, record, action, policy_class: nil)
           Pundit.authorize(user, record, action, policy_class: policy_class)
-        rescue Pundit::NotDefinedError
-          raise NoPolicyError
-        rescue Pundit::NotAuthorizedError
-          raise NotAuthorizedError
+        rescue Pundit::NotDefinedError => error
+          raise NoPolicyError.new error.message
+        rescue Pundit::NotAuthorizedError => error
+          raise NotAuthorizedError.new error.message
         end
 
         def policy(user, record)
@@ -16,8 +16,8 @@ module Avo
 
         def policy!(user, record)
           Pundit.policy!(user, record)
-        rescue Pundit::NotDefinedError
-          raise NoPolicyError
+        rescue Pundit::NotDefinedError => error
+          raise NoPolicyError.new error.message
         end
 
         def apply_policy(user, model, policy_class: nil)
@@ -32,7 +32,7 @@ module Avo
             Pundit.policy_scope!(user, model)
           end
         rescue Pundit::NotDefinedError => error
-          raise NoPolicyError
+          raise NoPolicyError.new error.message
         end
 
         private

data/lib/avo/services/authorization_service.rb

@@ -7,7 +7,20 @@ module Avo
 
       class << self
         def client
-          (configuration_client || default_client).new
+          client = Avo.configuration.authorization_client
+
+          klass = case client
+          when :pundit, nil
+            pundit_client
+          else
+            if client.is_a?(String)
+              client.safe_constantize
+            else
+              client
+            end
+          end
+
+          klass.new
         end
 
         def authorize(user, record, action, policy_class: nil, **args)
@@ -78,19 +91,7 @@ module Avo
           end
         end
 
-        def configuration_client
-          client = Avo.configuration.authorization_client
-
-          return if client.blank?
-
-          if client.is_a?(String)
-            client.safe_constantize
-          else
-            client
-          end
-        end
-
-        def default_client
+        def pundit_client
           Avo::Services::AuthorizationClients::PunditClient
         end
       end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.17.1.pre.4.issue.1342" unless const_defined?(:VERSION)
+  VERSION = "2.17.1.pre.5.stackedlayout" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/initializer/avo.tt

@@ -30,7 +30,7 @@ Avo.configure do |config|
   #   destroy: 'destroy?',
   # }
   # config.raise_error_on_missing_policy = false
-  # config.authorization_client = false
+  # config.authorization_client = :pundit
 
   ## == Localization ==
   # config.locale = 'en-US'
@@ -59,6 +59,7 @@ Avo.configure do |config|
   # config.resource_controls = :right
   # config.tabs_style = :tabs # can be :tabs or :pills
   # config.buttons_on_form_footers = true
+  # config.field_wrapper_layout = true
 
   ## == Branding ==
   # config.branding = {

data/public/avo-assets/avo.base.css

@@ -8034,6 +8034,11 @@ trix-toolbar .trix-button-group:not(:first-child){
   color:rgb(22 163 74 / var(--tw-text-opacity))
 }
 
+.\!text-pink-600{
+  --tw-text-opacity:1 !important;
+  color:rgb(219 39 119 / var(--tw-text-opacity)) !important
+}
+
 .underline{
   -webkit-text-decoration-line:underline;
           text-decoration-line:underline