avo 2.10.2 → 2.11.1.pre.1

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

@@ -2,63 +2,147 @@ import { Controller } from '@hotwired/stimulus'
 import { DateTime } from 'luxon'
 import flatpickr from 'flatpickr'
 
-import { castBoolean } from '../../helpers/cast_boolean'
-
 // Get the DateTime with the TZ offset applied.
 function universalTimestamp(timestampStr) {
   return new Date(new Date(timestampStr).getTime() + (new Date(timestampStr).getTimezoneOffset() * 60 * 1000))
 }
 
 export default class extends Controller {
-  static targets = ['input']
+  static targets = ['input', 'fakeInput']
+
+  static values = {
+    view: String,
+    timezone: String,
+    format: String,
+    enableTime: Boolean,
+    pickerFormat: String,
+    firstDayOfWeek: Number,
+    time24Hr: Boolean,
+    disableMobile: Boolean,
+  }
+
+  get browserZone() {
+    const time = DateTime.local()
+
+    return time.zoneName
+  }
+
+  get initialValue() {
+    if (this.isOnShow || this.isOnIndex) {
+      return this.context.element.innerText
+    } if (this.isOnEdit) {
+      return this.inputTarget.value
+    }
+
+    return null
+  }
+
+  get isOnIndex() {
+    return this.viewValue === 'index'
+  }
+
+  get isOnEdit() {
+    return this.viewValue === 'edit'
+  }
+
+  get isOnShow() {
+    return this.viewValue === 'show'
+  }
+
+  // Parse the time as if it were UTC
+  get parsedValue() {
+    return DateTime.fromISO(this.initialValue, { zone: 'UTC' })
+  }
+
+  get displayTimezone() {
+    return this.timezoneValue || this.browserZone
+  }
 
   connect() {
+    if (this.isOnShow || this.isOnIndex) {
+      this.initShow()
+    } else if (this.isOnEdit) {
+      this.initEdit()
+    }
+  }
+
+  // Turns the value in the controller wrapper into the timezone of the browser
+  initShow() {
+    let value = this.parsedValue
+
+    // Set the zone only if the type of field is date time.
+    if (this.enableTimeValue) {
+      value = value.setZone(this.displayTimezone)
+    }
+
+    this.context.element.innerText = value.toFormat(this.formatValue)
+  }
+
+  initEdit() {
     const options = {
       enableTime: false,
       enableSeconds: false,
       // eslint-disable-next-line camelcase
-      time_24hr: false,
+      time_24hr: this.time24HrValue,
       locale: {
         firstDayOfWeek: 0,
       },
       altInput: true,
+      onChange: this.onChange.bind(this),
     }
-    const enableTime = castBoolean(this.inputTarget.dataset.enableTime)
 
     // Set the format of the displayed input field.
-    options.altFormat = this.inputTarget.dataset.pickerFormat
+    options.altFormat = this.pickerFormatValue
 
     // Disable native input in mobile browsers
-    options.disableMobile = this.inputTarget.dataset.disableMobile
+    options.disableMobile = this.disableMobileValue
 
     // Set first day of the week.
-    options.locale.firstDayOfWeek = this.inputTarget.dataset.firstDayOfWeek
+    options.locale.firstDayOfWeek = this.firstDayOfWeekValue
 
     // Enable time if needed.
-    options.enableTime = enableTime
-    options.enableSeconds = enableTime
-
-    let currentValue
+    options.enableTime = this.enableTimeValue
+    options.enableSeconds = this.enableTimeValue
 
     // enable timezone display
-    if (enableTime) {
-      currentValue = DateTime.fromISO(this.inputTarget.value, { zone: window.Avo.configuration.timezone })
-      currentValue = currentValue.setZone(this.inputTarget.dataset.timezone)
-      currentValue = currentValue.toISO()
+    if (this.enableTimeValue) {
+      console.log(1)
+      options.defaultDate = this.parsedValue.setZone(this.displayTimezone).toISO()
 
       options.dateFormat = 'Y-m-d H:i:S'
-      // eslint-disable-next-line camelcase
-      options.time_24hr = castBoolean(this.inputTarget.dataset.time24hr)
-      // this.timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
-      options.appTimezone = this.inputTarget.dataset.timezone
     } else {
-      // Because the browser treats the date like a timestamp and updates it ot 00:00 hour, when on a western timezone the date will be converted with one day offset.
+      console.log(2)
+
+      // 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
-      currentValue = universalTimestamp(this.inputTarget.value)
+      options.defaultDate = universalTimestamp(this.initialValue)
     }
 
-    options.defaultDate = currentValue
+    flatpickr(this.fakeInputTarget, options)
+
+    this.updateRealInput(this.parsedValue.setZone(this.displayTimezone).toISO())
+  }
+
+  onChange(selectedDates) {
+    let time
+    let args = {}
+
+    if (this.timezoneValue) {
+      args = { keepLocalTime: true }
+    } else {
+      args = { keepLocalTime: false }
+    }
+
+    if (this.enableTimeValue) {
+      time = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', args)
+    } else {
+      time = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: true })
+    }
+
+    this.updateRealInput(time)
+  }
 
-    flatpickr(this.inputTarget, options)
+  updateRealInput(value) {
+    this.inputTarget.value = value
   }
 }

data/app/javascript/js/controllers/search_controller.js

@@ -147,6 +147,9 @@ export default class extends Controller {
               case 'rounded':
                 classes = 'rounded'
                 break
+              case 'square':
+                classes = 'rounded-none'
+                break
             }
 
             children.push(

data/app/views/avo/partials/_javascript.html.erb

@@ -1,6 +1,6 @@
 <%= javascript_tag nonce: true do %>
   window.Avo = window.Avo || { configuration: {} }
   Avo.configuration.timezone = '<%= Avo.configuration.timezone %>'
-  Avo.configuration.root_path = '<%= Avo.configuration.root_path %>'
+  Avo.configuration.root_path = '<%= root_path_without_url %>'
   Avo.configuration.search_debounce = '<%= Avo.configuration.search_debounce %>'
 <% end %>

data/config/routes.rb

@@ -16,16 +16,17 @@ Avo::Engine.routes.draw do
     post "/resources/:resource_name/:id/attachments/", to: "attachments#create"
   end
 
+  # Records ordering
+  scope "reorder", as: "reorder" do
+    patch "/:resource_name/:id", to: "reorder#order", as: "order"
+  end
+
   get "failed_to_load", to: "home#failed_to_load"
 
   scope "resources", as: "resources" do
     # Attachments
     delete "/:resource_name/:id/active_storage_attachments/:attachment_name/:attachment_id", to: "attachments#destroy"
 
-    # Ordering
-    patch "/:resource_name/:id/order", to: "resources#order", as: "order"
-    patch "/:resource_name/:id/:related_name/:related_id/order", to: "associations#order", as: "associations_order"
-
     # Actions
     get "/:resource_name(/:id)/actions/:action_id", to: "actions#show"
     post "/:resource_name(/:id)/actions/:action_id", to: "actions#handle"

data/db/factories.rb

@@ -44,6 +44,7 @@ FactoryBot.define do
 
   factory :comment do
     body { Faker::Lorem.paragraphs(number: rand(4...10)).join(" ") }
+    posted_at { Time.now - rand(10...365).days }
   end
 
   factory :review do

data/lib/avo/app.rb

@@ -20,8 +20,6 @@ module Avo
       def boot
         init_fields
 
-        I18n.locale = Avo.configuration.language_code
-
         if Rails.cache.instance_of?(ActiveSupport::Cache::NullStore)
           self.cache_store ||= ActiveSupport::Cache::MemoryStore.new
         else
@@ -172,7 +170,7 @@ module Avo
         payload[:license_abilities] = Avo::App&.license&.abilities
         payload[:cache_store] = self.cache_store&.class&.to_s
         payload[:avo_metadata] = hq&.avo_metadata
-        payload[:app_timezone] = Time.now.zone
+        payload[:app_timezone] = Time.current.zone
         payload[:cache_key] = Avo::Licensing::HQ.cache_key
         payload[:cache_key_contents] = hq&.cached_response
 

data/lib/avo/base_action.rb

@@ -1,7 +1,5 @@
 module Avo
   class BaseAction
-    extend HasContext
-
     include Avo::Concerns::HasFields
 
     class_attribute :name, default: nil
@@ -23,8 +21,16 @@ module Avo
     attr_accessor :user
 
     delegate :view, to: :class
+    delegate :context, to: ::Avo::App
+    delegate :current_user, to: ::Avo::App
+    delegate :params, to: ::Avo::App
+    delegate :view_context, to: ::Avo::App
+    delegate :avo, to: :view_context
+    delegate :main_app, to: :view_context
 
     class << self
+      delegate :context, to: ::Avo::App
+
       def form_data_attributes
         # We can't respond with a file download from Turbo se we disable it on the form
         if may_download_file
@@ -64,10 +70,6 @@ module Avo
       @response[:messages] = []
     end
 
-    def context
-      self.class.context
-    end
-
     def get_attributes_for_action
       get_fields.map do |field|
         [field.id, field.value]

data/lib/avo/base_resource.rb

@@ -1,7 +1,6 @@
 module Avo
   class BaseResource
     extend ActiveSupport::DescendantsTracker
-    extend HasContext
 
     include ActionView::Helpers::UrlHelper
     include Avo::Concerns::HasModel
@@ -10,12 +9,15 @@ module Avo
     include Avo::Concerns::ModelClassConstantized
 
     delegate :view_context, to: ::Avo::App
+    delegate :current_user, to: ::Avo::App
+    delegate :params, to: ::Avo::App
     delegate :simple_format, :content_tag, to: :view_context
     delegate :main_app, to: :view_context
     delegate :avo, to: :view_context
     delegate :resource_path, to: :view_context
     delegate :resources_path, to: :view_context
     delegate :t, to: ::I18n
+    delegate :context, to: ::Avo::App
 
     attr_accessor :view
     attr_accessor :model
@@ -48,6 +50,7 @@ module Avo
 
     class << self
       delegate :t, to: ::I18n
+      delegate :context, to: ::Avo::App
 
       def grid(&block)
         grid_collector = GridCollector.new
@@ -101,7 +104,7 @@ module Avo
 
     def initialize
       unless self.class.model_class.present?
-        if model_class.present?
+        if model_class.present? && model_class.respond_to?(:base_class)
           self.class.model_class = model_class.base_class
         end
       end
@@ -153,7 +156,7 @@ module Avo
     end
 
     def class_name_without_resource
-      self.class.name.demodulize.chomp("Resource")
+      self.class.name.demodulize.delete_suffix("Resource")
     end
 
     def model_class
@@ -199,7 +202,7 @@ module Avo
     end
 
     def name
-      default = class_name_without_resource.titlecase
+      default = class_name_without_resource.to_s.gsub('::', ' ').underscore.humanize
 
       return @name if @name.present?
 
@@ -242,10 +245,6 @@ module Avo
       view_types
     end
 
-    def context
-      self.class.context
-    end
-
     def attached_file_fields
       get_field_definitions.select do |field|
         [Avo::Fields::FileField, Avo::Fields::FilesField].include? field.class

data/lib/avo/concerns/handles_field_args.rb

@@ -28,7 +28,7 @@ module Avo
         add_prop_from_args args, name: name, default: default, type: :array
       end
 
-      def add_string_prop(args, name, default = [])
+      def add_string_prop(args, name, default = nil)
         add_prop_from_args args, name: name, default: default, type: :string
       end
     end

data/lib/avo/concerns/has_fields.rb

@@ -183,6 +183,7 @@ module Avo
               if field.is_a?(Avo::Fields::BelongsToField)
                 if field.respond_to?(:foreign_key) &&
                     reflection.inverse_of.present? &&
+                    reflection.inverse_of.respond_to?(:foreign_key) &&
                     reflection.inverse_of.foreign_key == field.foreign_key
                   is_valid = false
                 end
@@ -191,6 +192,7 @@ module Avo
                 if field.respond_to?(:foreign_key) &&
                     field.is_polymorphic? &&
                     reflection.respond_to?(:polymorphic?) &&
+                    reflection.inverse_of.respond_to?(:foreign_key) &&
                     reflection.inverse_of.foreign_key == field.reflection.foreign_key
                   is_valid = false
                 end

data/lib/avo/configuration.rb

@@ -40,7 +40,7 @@ module Avo
       @per_page = 24
       @per_page_steps = [12, 24, 48, 72]
       @via_per_page = 8
-      @locale = "en-US"
+      @locale = nil
       @currency = "USD"
       @default_view_type = :table
       @license = "community"
@@ -78,16 +78,6 @@ module Avo
       @profile_menu = nil
     end
 
-    def locale_tag
-      ::ISO::Tag.new(locale)
-    end
-
-    def language_code
-      locale_tag.language.code
-    rescue
-      "en"
-    end
-
     def current_user_method(&block)
       @current_user = block if block.present?
     end
@@ -123,7 +113,7 @@ module Avo
     end
 
     def computed_root_path
-      Avo::App.root_path
+      Avo.configuration.root_path
     end
 
     def feature_enabled?(feature)

data/lib/avo/fields/base_field.rb

@@ -76,6 +76,8 @@ module Avo
         @index_text_align = args[:index_text_align] || :left
         @html = args[:html] || nil
 
+        @args = args
+
         @updatable = true
         @computable = true
         @computed = block.present?

data/lib/avo/fields/country_field.rb

@@ -1,6 +1,8 @@
 module Avo
   module Fields
     class CountryField < BaseField
+      include Avo::Fields::FieldExtensions::HasIncludeBlank
+
       attr_reader :countries
       attr_reader :display_code
 

data/lib/avo/fields/date_field.rb

@@ -10,21 +10,23 @@ module Avo
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @first_day_of_week = args[:first_day_of_week].present? ? args[:first_day_of_week].to_i : 0
-        @picker_format = args[:picker_format].present? ? args[:picker_format] : "Y-m-d"
-        @format = args[:format].present? ? args[:format] : :long
-        @relative = args[:relative].present? ? args[:relative] : false
-        @disable_mobile = args[:disable_mobile].present? ? args[:disable_mobile] : false
+        add_string_prop args, :first_day_of_week, 0
+        add_string_prop args, :picker_format, "Y-m-d"
+        add_string_prop args, :format, "yyyy-LL-dd"
+        add_boolean_prop args, :relative
+        add_boolean_prop args, :disable_mobile
       end
 
       def formatted_value
         return if value.blank?
 
-        if @format.is_a?(Symbol)
-          value.to_formatted_s(@format)
-        else
-          value.strftime(@format)
-        end
+        value.iso8601
+      end
+
+      def edit_formatted_value
+        return nil if value.nil?
+
+        value.iso8601
       end
     end
   end

data/lib/avo/fields/date_time_field.rb

@@ -2,25 +2,29 @@ module Avo
   module Fields
     class DateTimeField < DateField
       attr_reader :format
+      attr_reader :picker_format
       attr_reader :time_24hr
       attr_reader :timezone
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @picker_format = args[:picker_format].present? ? args[:picker_format] : "Y-m-d H:i:S"
-        @time_24hr = args[:time_24hr].present? ? args[:time_24hr] : false
-        @timezone = args[:timezone].present? ? args[:timezone] : Rails.application.config.time_zone
+        add_boolean_prop args, :time_24hr
+        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
       end
 
       def formatted_value
         return nil if value.nil?
 
-        if @format.is_a?(Symbol)
-          value.to_time.in_time_zone(timezone).to_formatted_s(@format)
-        else
-          value.to_time.in_time_zone(timezone).strftime(@format)
-        end
+        value.utc.to_time.iso8601
+      end
+
+      def edit_formatted_value
+        return nil if value.nil?
+
+        value.utc.iso8601
       end
 
       def fill_field(model, key, value, params)
@@ -32,10 +36,18 @@ module Avo
 
         return model if value.blank?
 
-        model[id] = value.to_time.in_time_zone(Rails.application.config.time_zone)
+        model[id] = utc_time(value)
 
         model
       end
+
+      def utc_time(value)
+        if timezone.present?
+          ActiveSupport::TimeZone.new(timezone).local_to_utc(Time.parse(value))
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/avo/fields/field_extensions/has_include_blank.rb

@@ -0,0 +1,17 @@
+module Avo
+  module Fields
+    module FieldExtensions
+      module HasIncludeBlank
+        def include_blank
+          if @args[:include_blank] == true
+            placeholder || '—'
+          elsif @args[:include_blank] == false
+            false
+          else
+            @args[:include_blank]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avo/fields/file_field.rb

@@ -6,6 +6,7 @@ module Avo
       attr_accessor :is_image
       attr_accessor :is_audio
       attr_accessor :direct_upload
+      attr_accessor :accept
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -15,6 +16,7 @@ module Avo
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
         @is_audio = args[:is_audio].present? ? args[:is_audio] : false
         @direct_upload = args[:direct_upload].present? ? args[:direct_upload] : false
+        @accept = args[:accept].present? ? args[:accept] : nil
       end
 
       def path

data/lib/avo/fields/files_field.rb

@@ -4,6 +4,7 @@ module Avo
       attr_accessor :is_audio
       attr_accessor :is_image
       attr_accessor :direct_upload
+      attr_accessor :accept
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -11,6 +12,7 @@ module Avo
         @is_audio = args[:is_audio].present? ? args[:is_audio] : false
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
         @direct_upload = args[:direct_upload].present? ? args[:direct_upload] : false
+        @accept = args[:accept].present? ? args[:accept] : nil
       end
 
       def view_component_name

data/lib/avo/fields/select_field.rb

@@ -1,6 +1,8 @@
 module Avo
   module Fields
     class SelectField < BaseField
+      include Avo::Fields::FieldExtensions::HasIncludeBlank
+
       attr_reader :options
       attr_reader :enum
       attr_reader :display_value

data/lib/avo/licensing/h_q.rb

@@ -121,6 +121,8 @@ module Avo
           cache_and_return_error "HTTP connection reset error.", exception.message
         rescue Errno::ECONNREFUSED => exception
           cache_and_return_error "HTTP connection refused error.", exception.message
+        rescue OpenSSL::SSL::SSLError => exception
+          cache_and_return_error "OpenSSL error.", exception.message
         rescue HTTParty::Error => exception
           cache_and_return_error "HTTP client error.", exception.message
         rescue Net::OpenTimeout => exception

data/lib/avo/services/uri_service.rb

@@ -13,6 +13,10 @@ module Avo
         @uri = Addressable::URI.parse(path)
       end
 
+      def call
+        to_s
+      end
+
       def append_paths(*paths)
         paths = Array.wrap(paths).flatten
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.10.2" unless const_defined?(:VERSION)
+  VERSION = "2.11.1.pre.1" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/action_generator.rb

@@ -1,9 +1,10 @@
-require "rails/generators"
+require_relative "named_base_generator"
 
 module Generators
   module Avo
-    class ActionGenerator < Rails::Generators::NamedBase
+    class ActionGenerator < NamedBaseGenerator
       source_root File.expand_path("templates", __dir__)
+
       class_option :standalone, type: :boolean
 
       namespace "avo:action"

data/lib/generators/avo/base_generator.rb

@@ -0,0 +1,14 @@
+require "rails/generators"
+
+module Generators
+  module Avo
+    class BaseGenerator < ::Rails::Generators::Base
+      hide!
+
+      def initialize(*args)
+        super(*args)
+        invoke "avo:version", *args
+      end
+    end
+  end
+end

data/lib/generators/avo/card/chartkick_generator.rb

@@ -0,0 +1,18 @@
+require_relative "../named_base_generator"
+
+module Generators
+  module Avo
+    module Card
+      class ChartkickGenerator < Generators::Avo::NamedBaseGenerator
+        source_root File.expand_path("../templates", __dir__)
+
+        namespace "avo:card:chartkick"
+        desc "Add a chartkick card for your Avo dashboard."
+
+        def handle
+          template "cards/chartkick_card_sample.tt", "app/avo/cards/#{name.underscore}.rb"
+        end
+      end
+    end
+  end
+end