avo 1.17.0 → 1.18.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afbc7118164b7104453b9440a65ee4ff84a9b2dc6a42f30cf39aaeaca93fc4e3
-  data.tar.gz: a37f8c6890e565c80f668d630795cfa15422c1d69f443e97542409afc7d6a9ef
+  metadata.gz: 8641081b1ddc20d52bc0b4d8a1c0172ab6c0923f0ebd1c166e335d50796411d8
+  data.tar.gz: 62d1fc74704027954f28dc1f962670966c1ccbb85a6440f19a28b797c479b805
 SHA512:
-  metadata.gz: 86bc59793edb35cc7af577d2145d20ae83fc964d7163fa647c53e6d3e560dfadbd5ef79650b45f15d621ee7aab89d2164302ec34e9547381cceacdf8e1613922
-  data.tar.gz: 1d012fb769f7f297f8eead60bbc296b01666e5d8852f3943c2706ad76bce0ae3ed3b8ac55a1509a84475436ca3cc70b6941070161467e51627561d98045bbff4
+  metadata.gz: 0ec3407fec3fa1dcb18054ca58692ee6d3e276a7c8ed911ffa43d1146f3b6a93f6a796393b9201957b63c02d0f9630107f5e8ab6add53c6108b19928d2566bf4
+  data.tar.gz: 2e1be9f862c67502c2dfddd004d4fceafdb9afbff3bb2e5ae7cbe29120d96e520c8cc79423408c8284713603aecedc96517b0ab9f38d91d00eb91fb2bbb55357

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.17.0)
+    avo (1.18.0.pre.3)
       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,15 +202,17 @@ 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)
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (4.11.0)
+    pagy (5.6.10)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -220,7 +222,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 +250,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 +259,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 +381,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 +441,4 @@ DEPENDENCIES
   zeitwerk (~> 2.3)
 
 BUNDLED WITH
-   2.2.29
+   2.2.32

data/app/components/avo/fields/common/multiple_file_viewer_component.html.erb

@@ -1,4 +1,6 @@
 <div class="relative min-h-full max-w-full flex-1 flex flex-col justify-between space-y-3">
+<%= @file.inspect %>
+<%= @id.inspect %>
   <% if @file.present? %>
     <% if @file.representable? && @is_image %>
       <%= image_tag helpers.main_app.url_for(@file), class: 'rounded-lg max-h-168 max-w-full' %>

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,8 @@
   <%= 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 %>
+    <div class="mt-2">
+      <%= @form.file_field @field.id, disabled: @field.readonly, multiple: true, direct_upload: @field.direct_upload %>
+    </div>
   <% end %>
 <% end %>

data/app/controllers/avo/attachments_controller.rb

@@ -21,8 +21,7 @@ module Avo
     end
 
     def destroy
-      blob = ActiveStorage::Blob.find(params[:signed_attachment_id])
-      attachment = blob.attachments.find_by record_id: params[:id], record_type: @model.class.to_s
+      attachment = ActiveStorage::Attachment.find(params[:signed_attachment_id])
 
       if attachment.present?
         attachment.destroy

data/app/packs/entrypoints/application.css

@@ -16,6 +16,7 @@
 @import './../stylesheets/pagination.css';
 @import './../stylesheets/breadcrumbs.css';
 @import './../stylesheets/search.css';
+@import './../stylesheets/active-storage.css';
 
 @import './../stylesheets/components/status.css';
 @import './../stylesheets/components/code.css';

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'
@@ -10,6 +11,7 @@ import Rails from '@rails/ujs'
 import tippy from 'tippy.js'
 
 // Toastr alerts
+import '../js/active-storage'
 import '../js/toastr'
 
 Rails.start()
@@ -32,6 +34,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/active-storage.js

@@ -0,0 +1,45 @@
+document.addEventListener('direct-upload:initialize', (event) => {
+  const { target, detail } = event
+  const { id, file } = detail
+
+  target.insertAdjacentHTML(
+    'beforebegin',
+    `
+    <div id="direct-upload-${id}" class="direct-upload direct-upload--pending">
+      <div id="direct-upload-progress-${id}" class="direct-upload__progress" style="width: 0%"></div>
+      <span class="direct-upload__filename"></span>
+    </div>
+  `,
+  )
+  target.previousElementSibling.querySelector(
+    '.direct-upload__filename',
+  ).textContent = file.name
+})
+
+document.addEventListener('direct-upload:start', (event) => {
+  const { id } = event.detail
+  const element = document.getElementById(`direct-upload-${id}`)
+  element.classList.remove('direct-upload--pending')
+})
+
+document.addEventListener('direct-upload:progress', (event) => {
+  const { id, progress } = event.detail
+  const progressElement = document.getElementById(
+    `direct-upload-progress-${id}`,
+  )
+  progressElement.style.width = `${progress}%`
+})
+
+document.addEventListener('direct-upload:error', (event) => {
+  event.preventDefault()
+  const { id, error } = event.detail
+  const element = document.getElementById(`direct-upload-${id}`)
+  element.classList.add('direct-upload--error')
+  element.setAttribute('title', error)
+})
+
+document.addEventListener('direct-upload:end', (event) => {
+  const { id } = event.detail
+  const element = document.getElementById(`direct-upload-${id}`)
+  element.classList.add('direct-upload--complete')
+})

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/app/packs/stylesheets/active-storage.css

@@ -0,0 +1,37 @@
+.direct-upload {
+  display: inline-block;
+  position: relative;
+  padding: 2px 4px;
+  margin: 0 3px 3px 0;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  border-radius: 3px;
+  font-size: 11px;
+  line-height: 13px;
+}
+
+.direct-upload--pending {
+  opacity: 0.6;
+}
+
+.direct-upload__progress {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  opacity: 0.2;
+  background: #0076ff;
+  transition: width 120ms ease-out, opacity 60ms 60ms ease-in;
+  transform: translate3d(0, 0, 0);
+}
+
+.direct-upload--complete .direct-upload__progress {
+  opacity: 0.4;
+}
+
+.direct-upload--error {
+  border-color: red;
+}
+
+input[type=file][data-direct-upload-url][disabled] {
+  display: none;
+}

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/engine.rb

@@ -2,7 +2,11 @@
 Gem.loaded_specs["avo"].dependencies.each do |d|
   require d.name
 end
-require "view_component/engine"
+
+# In development we should load the engine so we get the autoload for components
+if ENV["RAILS_ENV"] === "development"
+  require "view_component/engine"
+end
 
 module Avo
   class Engine < ::Rails::Engine

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?
+          # Keep only String values
+          next unless file.class === String
+
           model.send(key).attach file
         end
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.17.0"
+  VERSION = "1.18.0.pre.3"
 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
 

data/public/avo-packs/css/{application-2b4685ca.css → application-f9191617.css}

@@ -3220,6 +3220,44 @@ svg.tea #steamR {
   color: rgba(255, 255, 255, var(--tw-text-opacity));
 }
 
+.direct-upload {
+  display: inline-block;
+  position: relative;
+  padding: 2px 4px;
+  margin: 0 3px 3px 0;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  border-radius: 3px;
+  font-size: 11px;
+  line-height: 13px;
+}
+
+.direct-upload--pending {
+  opacity: 0.6;
+}
+
+.direct-upload__progress {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  opacity: 0.2;
+  background: #0076ff;
+  transition: width 120ms ease-out, opacity 60ms 60ms ease-in;
+  transform: translate3d(0, 0, 0);
+}
+
+.direct-upload--complete .direct-upload__progress {
+  opacity: 0.4;
+}
+
+.direct-upload--error {
+  border-color: red;
+}
+
+input[type=file][data-direct-upload-url][disabled] {
+  display: none;
+}
+
 .spinner {
   width: 16px;
   height: 16px;
@@ -6246,4 +6284,4 @@ html, body{
 }
 
 
-/*# sourceMappingURL=application-2b4685ca.css.map*/
+/*# sourceMappingURL=application-f9191617.css.map*/