avo 1.18.0.pre.1 → 1.18.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccd552281f8ac8b77ea15f6d9000271a447a01190cb3c46905898f94df366009
-  data.tar.gz: c97173ac80821f5ef2de0f3d1060be50fe1c3b2c19d1b2f8eb177c9fc750f2d2
+  metadata.gz: ca20ddd1db1b6f1d54f2aed3133447353a1bbba60ea7eda4b55487bbcc8f1239
+  data.tar.gz: 9631043fb317c49d93c76080172ebefeb278ca7749b8860eafe64f8fffe2c26f
 SHA512:
-  metadata.gz: 84703917f0960fb186bd79b5b7463298afd544e625f0b9ef83af6373c56d673e22479c2e88528cd2df1add04bd2ced0c31d50ea4bc6d856cfb26dd00a07cac42
-  data.tar.gz: f0e6a6d3b59bf79dac877bb012da1f56c979bf72897241e0f9d1633c7745e7fc1ce769d72610105d42b1e37d4a86f19e8a1e39370e709a2be24869a4b7a20981
+  metadata.gz: 3998c7fb60112685ab0d92754604f29b6a57bee36b235d2a9674a870ab83013f5e411419b8a14c4325b1b96386b807a7474561344cb0877c4045825af929d86a
+  data.tar.gz: 29e905bc525f5593910920eb574dc79e16d68fca01ff88ebe315fb6fe17b532e6c4cbafa7cd2ca20305e0db5e8d33b9349cd176f3d687bf828bc3285822ad0aa

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.18.0.pre.1)
+    avo (1.18.0.pre.2)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -209,8 +209,10 @@ GEM
     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 (5.6.6)
+    pagy (5.6.10)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)

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, direct_upload: @field.direct_upload %>
+    <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

@@ -11,6 +11,7 @@ import Rails from '@rails/ujs'
 import tippy from 'tippy.js'
 
 // Toastr alerts
+import '../js/active-storage'
 import '../js/toastr'
 
 Rails.start()

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/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/lib/avo/fields/files_field.rb

@@ -25,8 +25,8 @@ module Avo
         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
+          # 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.18.0.pre.1"
+  VERSION = "1.18.0.pre.2"
 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*/