avo 1.16.3 → 1.18.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24fb847d8c6ebd7ba3c45926bc5431d7d100b3baf56391e316d4f30cebbae4f7
-  data.tar.gz: 7eb97752916fd9159f0210e5f500a9b4c563c9d250ffa53b59dd1ad54b5ff770
+  metadata.gz: ccd552281f8ac8b77ea15f6d9000271a447a01190cb3c46905898f94df366009
+  data.tar.gz: c97173ac80821f5ef2de0f3d1060be50fe1c3b2c19d1b2f8eb177c9fc750f2d2
 SHA512:
-  metadata.gz: 99780816253684b5de953532a0da805fecf38ab55115475438d94553ebe24989912e45172f7028d4c468482427f3da1686ea78d5c698ad3f24ff771fc0be72dc
-  data.tar.gz: 54104ca33a97fb1508133b6f1db18772cf94db9404d2c4dde5b507bc64b2c80fba54c00501bad998f6998a83f533902c18dd6425b541c451c9d55c917b11699f
+  metadata.gz: 84703917f0960fb186bd79b5b7463298afd544e625f0b9ef83af6373c56d673e22479c2e88528cd2df1add04bd2ced0c31d50ea4bc6d856cfb26dd00a07cac42
+  data.tar.gz: f0e6a6d3b59bf79dac877bb012da1f56c979bf72897241e0f9d1633c7745e7fc1ce769d72610105d42b1e37d4a86f19e8a1e39370e709a2be24869a4b7a20981

data/Gemfile

@@ -115,7 +115,7 @@ gem "hotwire-rails"
 
 gem "active_link_to"
 
-gem "view_component", require: "view_component/engine"
+gem "view_component"
 
 gem "addressable"
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.16.3)
+    avo (1.18.0.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -107,7 +107,7 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.16)
     bindex (0.8.1)
-    bootsnap (1.7.3)
+    bootsnap (1.9.3)
       msgpack (~> 1.0)
     breadcrumbs_on_rails (4.0.0)
       rails (>= 5.0)
@@ -123,7 +123,7 @@ GEM
       regexp_parser (~> 1.5)
       xpath (~> 3.2)
     childprocess (3.0.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     countries (3.1.0)
       i18n_data (~> 0.11.0)
       sixarm_ruby_unaccent (~> 1.1)
@@ -131,7 +131,7 @@ GEM
     crack (0.4.4)
     crass (1.0.6)
     database_cleaner (1.8.5)
-    devise (4.7.3)
+    devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -168,7 +168,7 @@ GEM
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     i18n_data (0.11.0)
     image_processing (1.12.1)
@@ -184,7 +184,7 @@ GEM
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.9.1)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -202,7 +202,7 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.0.3)
     mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    minitest (5.15.0)
     msgpack (1.4.2)
     multi_xml (0.6.0)
     nio4r (2.5.8)
@@ -210,7 +210,7 @@ GEM
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (4.11.0)
+    pagy (5.6.6)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -220,7 +220,7 @@ GEM
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-proxy (0.6.5)
       rack
@@ -248,7 +248,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     railties (6.1.3.2)
       actionpack (= 6.1.3.2)
@@ -257,7 +257,7 @@ GEM
       rake (>= 0.8.7)
       thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     ransack (2.4.2)
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
@@ -379,7 +379,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.2)
 
 PLATFORMS
   ruby
@@ -439,4 +439,4 @@ DEPENDENCIES
   zeitwerk (~> 2.3)
 
 BUNDLED WITH
-   2.2.29
+   2.2.32

data/app/components/avo/fields/common/multiple_file_viewer_component.rb

@@ -3,10 +3,11 @@
 class Avo::Fields::Common::MultipleFileViewerComponent < ViewComponent::Base
   include Avo::ApplicationHelper
 
-  def initialize(id:, file:, is_image:, resource:, button_size: :md)
+  def initialize(id:, file:, is_image:, direct_upload: false, resource:, button_size: :md)
     @id = id
     @file = file
     @is_image = is_image
+    @direct_upload = direct_upload
     @button_size = button_size
     @resource = resource
   end

data/app/components/avo/fields/common/single_file_viewer_component.rb

@@ -3,10 +3,11 @@
 class Avo::Fields::Common::SingleFileViewerComponent < ViewComponent::Base
   include Avo::ApplicationHelper
 
-  def initialize(id:, file:, is_image:, resource:, button_size: :md)
+  def initialize(id:, file:, is_image:, direct_upload: false, resource:, button_size: :md)
     @id = id
     @file = file
     @is_image = is_image
+    @direct_upload = direct_upload
     @button_size = button_size
     @resource = resource
   end

data/app/components/avo/fields/file_field/edit_component.html.erb

@@ -6,6 +6,6 @@
   <% end %>
 
   <% if @resource.authorization.authorize_action(:upload_attachments?, raise_exception: false) %>
-    <%= @form.file_field @field.id, disabled: @field.readonly %>
+    <%= @form.file_field @field.id, disabled: @field.readonly, direct_upload: @field.direct_upload %>
   <% end %>
 <% end %>

data/app/components/avo/fields/files_field/edit_component.html.erb

@@ -2,6 +2,6 @@
   <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 
   <% if @resource.authorization.authorize_action(:upload_attachments?, raise_exception: false) %>
-    <%= @form.file_field @field.id, disabled: @field.readonly, multiple: true %>
+    <%= @form.file_field @field.id, disabled: @field.readonly, multiple: true, direct_upload: @field.direct_upload %>
   <% end %>
 <% end %>

data/app/controllers/avo/actions_controller.rb

@@ -19,7 +19,9 @@ module Avo
       end
 
       args = {
-        fields: fields
+        fields: fields,
+        current_user: _current_user,
+        resource: resource,
       }
 
       args[:models] = models unless @action.standalone

data/app/packs/entrypoints/application.js

@@ -2,6 +2,7 @@
 import 'core-js/stable'
 // eslint-disable-next-line import/no-extraneous-dependencies
 import 'regenerator-runtime/runtime'
+import * as ActiveStorage from '@rails/activestorage'
 import * as Mousetrap from 'mousetrap'
 import { Application } from 'stimulus'
 import { Turbo } from '@hotwired/turbo-rails'
@@ -32,6 +33,7 @@ function initTippy() {
 window.initTippy = initTippy
 
 const application = Application.start()
+ActiveStorage.start()
 
 const context = require.context('./../js/controllers', true, /\.js$/)
 application.load(definitionsFromContext(context))

data/app/packs/js/controllers/filter_controller.js

@@ -21,6 +21,23 @@ export default class extends Controller {
     return param
   }
 
+  b64EncodeUnicode(str) {
+    // first we use encodeURIComponent to get percent-encoded UTF-8,
+    // then we convert the percent encodings into raw bytes which
+    // can be fed into btoa.
+    return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g,
+      function toSolidBytes(match, p1) {
+        return String.fromCharCode('0x' + p1);
+      }));
+  }
+
+  b64DecodeUnicode(str) {
+    // Going backwards: from bytestream, to percent-encoding, to original string.
+    return decodeURIComponent(atob(str).split('').map(function(c) {
+      return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+    }).join(''));
+  }
+
   changeFilter() {
     const value = this.getFilterValue()
     const filterClass = this.getFilterClass()
@@ -28,7 +45,7 @@ export default class extends Controller {
     let filters = this.uriParams()[this.uriParam('filters')]
 
     if (filters) {
-      filters = JSON.parse(atob(filters))
+      filters = JSON.parse(this.b64DecodeUnicode(filters))
     } else {
       filters = {}
     }
@@ -46,7 +63,7 @@ export default class extends Controller {
     let encodedFilters
 
     if (filtered && Object.keys(filtered).length > 0) {
-      encodedFilters = btoa(JSON.stringify(filtered))
+      encodedFilters = this.b64EncodeUnicode(JSON.stringify(filtered))
     }
 
     const url = new URI(this.urlRedirectTarget.href)

data/config/routes.rb

@@ -2,6 +2,7 @@ Avo::Engine.routes.draw do
   root "home#index"
 
   get "resources", to: redirect("/admin")
+  post "/rails/active_storage/direct_uploads", to: "/active_storage/direct_uploads#create"
 
   scope "avo_api", as: "avo_api" do
     get "/search", to: "search#index"

data/lib/avo/app.rb

@@ -32,9 +32,9 @@ module Avo
 
         # Set the current host for ActiveStorage
         begin
-          ActiveStorage::Current.host = request.base_url
+          ActiveStorage::Current.url_options = request.base_url
         rescue => exception
-          Rails.logger.debug "[Avo] Failed to set ActiveStorage::Current.host, #{exception.inspect}"
+          Rails.logger.debug "[Avo] Failed to set ActiveStorage::Current.url_options, #{exception.inspect}"
         end
 
         init_resources

data/lib/avo/base_action.rb

@@ -70,7 +70,7 @@ module Avo
     end
 
     def handle_action(**args)
-      models, fields = args.values_at(:models, :fields)
+      models, fields, current_user, resource = args.values_at(:models, :fields, :current_user, :resource)
       avo_fields = get_fields.map { |field| [field.id, field] }.to_h
 
       if fields.present?
@@ -84,7 +84,9 @@ module Avo
       end
 
       args = {
-        fields: processed_fields
+        fields: processed_fields,
+        current_user: current_user,
+        resource: resource,
       }
 
       args[:models] = models unless standalone

data/lib/avo/base_resource.rb

@@ -16,6 +16,7 @@ module Avo
     class_attribute :includes, default: []
     class_attribute :model_class
     class_attribute :translation_key
+    class_attribute :translation_enabled
     class_attribute :default_view_type, default: :table
     class_attribute :devise_password_optional, default: false
     class_attribute :actions_loader
@@ -94,7 +95,7 @@ module Avo
       return [] if self.class.fields.blank?
 
       fields = self.class.fields.map do |field|
-        field.hydrate(resource: self, panel_name: default_panel_name, user: user)
+        field.hydrate(resource: self, panel_name: default_panel_name, user: user, translation_enabled: translation_enabled)
       end
 
       if Avo::App.license.lacks_with_trial(:custom_fields)
@@ -192,12 +193,16 @@ module Avo
       ]
     end
 
+    def class_name_without_resource
+      self.class.name.demodulize.chomp("Resource")
+    end
+
     def model_class
       return self.class.model_class if self.class.model_class.present?
 
       return @model.class if @model.present?
 
-      self.class.name.demodulize.chomp("Resource").safe_constantize
+      class_name_without_resource.safe_constantize
     end
 
     def model_title
@@ -206,12 +211,18 @@ module Avo
       name
     end
 
+    def translation_key
+      return "avo.resource_translations.#{class_name_without_resource.underscore}" if self.class.translation_enabled
+
+      self.class.translation_key
+    end
+
     def name
       return @name if @name.present?
 
-      return I18n.t(self.class.translation_key, count: 1).capitalize if self.class.translation_key
+      return I18n.t(translation_key, count: 1).capitalize if translation_key
 
-      self.class.name.demodulize.chomp("Resource").titlecase
+      class_name_without_resource.titlecase
     end
 
     def singular_name
@@ -219,7 +230,7 @@ module Avo
     end
 
     def plural_name
-      return I18n.t(self.class.translation_key, count: 2).capitalize if self.class.translation_key
+      return I18n.t(translation_key, count: 2).capitalize if translation_key
 
       name.pluralize
     end

data/lib/avo/engine.rb

@@ -2,7 +2,6 @@
 Gem.loaded_specs["avo"].dependencies.each do |d|
   require d.name
 end
-require "view_component/engine"
 
 module Avo
   class Engine < ::Rails::Engine

data/lib/avo/fields/base_field.rb

@@ -6,8 +6,6 @@ module Avo
       include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
       attr_reader :id
-      attr_reader :name
-      attr_reader :translation_key
       attr_reader :block
       attr_reader :required
       attr_reader :readonly
@@ -43,8 +41,9 @@ module Avo
         super(id, **args, &block)
 
         @id = id
-        @name = args[:name] || id.to_s.humanize(keep_id_suffix: true)
+        @name = args[:name]
         @translation_key = args[:translation_key]
+        @translation_enabled = false
         @block = block
         @required = args[:required] || false
         @readonly = args[:readonly] || false
@@ -72,17 +71,32 @@ module Avo
         except_on args[:except_on] if args[:except_on].present?
       end
 
-      def hydrate(model: nil, resource: nil, action: nil, view: nil, panel_name: nil, user: nil)
+      def hydrate(model: nil, resource: nil, action: nil, view: nil, panel_name: nil, user: nil, translation_enabled: nil)
         @model = model if model.present?
         @view = view if view.present?
         @resource = resource if resource.present?
         @action = action if action.present?
         @user = user if user.present?
         @panel_name = panel_name if panel_name.present?
+        @translation_enabled = translation_enabled if translation_enabled.present?
 
         self
       end
 
+      def translation_key
+        return "avo.field_translations.#{@id}" if @translation_enabled
+
+        @translation_key
+      end
+
+      def name
+        return @name if @name.present?
+
+        return I18n.t(translation_key, count: 1).capitalize if translation_key
+
+        @id.to_s.humanize(keep_id_suffix: true)
+      end
+
       def visible?
         if visible.present? && visible.respond_to?(:call)
           visible.call resource: @resource

data/lib/avo/fields/date_time_field.rb

@@ -17,7 +17,7 @@ module Avo
         return nil if value.nil?
 
         if @format.is_a?(Symbol)
-          value.to_time.in_time_zone(timezone).to_s(@format)
+          value.to_time.in_time_zone(timezone).to_formatted_s(@format)
         else
           value.to_time.in_time_zone(timezone).strftime(@format)
         end

data/lib/avo/fields/file_field.rb

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

data/lib/avo/fields/files_field.rb

@@ -2,11 +2,13 @@ module Avo
   module Fields
     class FilesField < BaseField
       attr_accessor :is_image
+      attr_accessor :direct_upload
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
+        @direct_upload = args[:direct_upload].present? ? args[:direct_upload] : false
       end
 
       def view_component_name
@@ -21,6 +23,11 @@ module Avo
         return model unless model.methods.include? key.to_sym
 
         value.each do |file|
+          # Skip empty values
+          next unless file.present?
+          # Skip Capybara Nil files in tests
+          next unless file.class === Capybara::RackTest::Form::NilUploadedFile
+
           model.send(key).attach file
         end
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.16.3"
+  VERSION = "1.18.0.pre.1"
 end

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

@@ -1,7 +1,9 @@
 class <%= class_name.camelize %> < Avo::BaseAction
   self.name = '<%= name.underscore.humanize %>'
 
-  def handle(models:, fields:)
+  def handle(**args)
+    models, fields, current_user, resource = args.values_at(:models, :fields, :current_user, :resource)
+
     models.each do |model|
       # Do something with your models.
     end

data/lib/generators/avo/templates/filters/boolean_filter.tt

@@ -1,7 +1,7 @@
 class <%= class_name.camelize %> < Avo::Filters::BooleanFilter
   self.name = '<%= name.underscore.humanize %>'
 
-  def apply(request, query, value)
+  def apply(request, query, values)
     query
   end