avo 2.30.0 → 2.30.1.pre1.pr1683

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a6931f5fd184bfb437e0541849e04f4452764059b23582ca000a977f805bc8
-  data.tar.gz: ba1137efa1e302b64bb86635b7c6327cd145d0fa68b787f8540bd5089a9e8bd9
+  metadata.gz: c3c650833493f18162beff6fcb0244af4a5a2a6d91041a9be0b0103cb027f85b
+  data.tar.gz: af1f9219ac03dc7bfe05812010d025e26d5f26fec0b59feb56519045ae6385d3
 SHA512:
-  metadata.gz: d0a68869c9647f57f3d3ffe1699e7e6fd1a2c0cc4fcbceadb127b1312893cf53eb8d2a89df9c160a058a824846bd128ed9e681eecbe06dd90c61bd91641a5132
-  data.tar.gz: e92694271216d763281657edc6b128f05dd8ff104b7228eabeca8570bb86dad6c91a2712410655a744f600db466fea2a25f349182881ab32fecceef3d1763669
+  metadata.gz: 2a5b5b6e180b2d66d218b5e3d3f9f32622cacbb44104ac4a2d0e5ab6e0725d8e469ea0c5c830d04c0a489f9265bd6f2483ad92a2ec3c343d86a379bce63a8914
+  data.tar.gz: fd0a75e4c866d6a8562045ac0626378528a0751260788a9c9c3cf80183a4a698a0ac188396bba5c19e370b40a9831b1ce9d1d56e17bebc4638b0e8dbe7bffaec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.30.0)
+    avo (2.30.1.pre1.pr1683)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -269,10 +269,10 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.14.2)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (6.0.3)

data/app/components/avo/fields/common/files/controls_component.html.erb

@@ -0,0 +1,29 @@
+<div class="flex">
+  <% if can_download_file? %>
+    <%= a_link Rails.application.routes.url_helpers.rails_blob_path(file, only_path: true, disposition: :attachment),
+      icon: 'heroicons/outline/download',
+      color: :primary,
+      download: true,
+      class: 'text-center',
+      title: t('avo.download_file'),
+      data: { tippy: :tooltip },
+      compact: true,
+      size: :xs %>
+  <% end %>
+</div>
+<div>
+  <% if can_delete_file? %>
+    <%= a_link destroy_path,
+      icon: 'heroicons/outline/trash',
+      color: :red,
+      compact: true,
+      size: :xs,
+      class: 'text-center',
+      title: t('avo.delete_file', item: file.filename),
+      data: {
+        turbo_method: :delete,
+        turbo_confirm: t('avo.are_you_sure'),
+        tippy: :tooltip
+      } %>
+  <% end %>
+</div>

data/app/components/avo/fields/common/files/controls_component.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class Avo::Fields::Common::Files::ControlsComponent < ViewComponent::Base
+  include Avo::ApplicationHelper
+  include Avo::Fields::Concerns::FileAuthorization
+
+  attr_reader :file, :field, :resource
+  delegate :id, to: :field
+
+  def initialize(field:, file:, resource:)
+    @field = field
+    @file = file
+    @resource = resource
+  end
+
+  def destroy_path
+    Avo::Services::URIService.parse(@resource.record_path).append_paths("active_storage_attachments", id, file.id).to_s
+  end
+end

data/app/components/avo/fields/common/files/list_viewer_component.html.erb

@@ -0,0 +1,14 @@
+<div class="-mt-9">
+  <%= turbo_frame_tag @field.id do %>
+    <% unless @field.hide_view_type_changer %>
+      <div class="justify-self-end flex justify-end items-center space-x-3">
+        <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: @field.view_type, turbo_frame: @field.id } %>
+      </div>
+    <% end %>
+    <div class="<%= classes %>">
+      <% @field.value.attachments.each do |file| %>
+        <%= render @field.viewer_component.new field: @field, resource: @resource, file: file %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

data/app/components/avo/fields/common/files/list_viewer_component.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Avo::Fields::Common::Files::ListViewerComponent < ViewComponent::Base
+  include Turbo::FramesHelper
+
+  def initialize(field:, resource:)
+    @field = field
+    @resource = resource
+  end
+
+  def classes
+    base_classes = "py-4 rounded-xl"
+
+    view_type_classes = if @field.view_type == :list
+      "flex flex-col space-y-2"
+    else
+      "relative grid xs:grid-cols-2 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-6 gap-6"
+    end
+
+    "#{base_classes} #{view_type_classes}"
+  end
+
+  def available_view_types
+    [:list, :grid]
+  end
+end

data/app/components/avo/fields/common/files/view_type/grid_component.html.erb

@@ -0,0 +1,27 @@
+<div class="relative min-h-full max-w-full flex-1 flex flex-col justify-between space-y-2">
+  <% if file.present? %>
+    <div class="flex flex-col justify-between h-full">
+      <% if file.representable? && is_image? %>
+        <%= image_tag helpers.main_app.url_for(file), class: 'rounded-lg object-cover w-full aspect-video' %>
+      <% elsif is_audio? %>
+        <%= audio_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
+      <% elsif is_video? %>
+        <%= video_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
+      <% else %>
+        <div class="relative flex flex-col justify-evenly items-center px-2 rounded-lg border bg-white border-gray-500 min-h-24">
+          <div class="flex flex-col justify-center items-center w-full">
+            <%= helpers.svg 'document-text', class: 'h-10 text-gray-600 mb-2' %>
+          </div>
+        </div>
+      <% end %>
+      <% if field.display_filename %>
+        <span class="text-gray-500 mt-1 text-sm truncate" title="<%= file.filename %>"><%= file.filename %></span>
+      <% end %>
+    </div>
+    <div class="flex space-x-2">
+      <%= render Avo::Fields::Common::Files::ControlsComponent.new(field: field, file: file, resource: resource) %>
+    </div>
+  <% else %>
+    –
+  <% end %>
+</div>

data/app/components/avo/fields/common/{single_file_viewer_component.rb → files/view_type/grid_component.rb}

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
-class Avo::Fields::Common::SingleFileViewerComponent < ViewComponent::Base
-  include Avo::ApplicationHelper
-  include Avo::Fields::Concerns::FileAuthorization
-
-  attr_reader :field
+class Avo::Fields::Common::Files::ViewType::GridComponent < ViewComponent::Base
+  attr_reader :field, :resource
 
   def initialize(field:, resource:, file: nil)
     @file = file
@@ -12,10 +9,6 @@ class Avo::Fields::Common::SingleFileViewerComponent < ViewComponent::Base
     @resource = resource
   end
 
-  def destroy_path
-    Avo::Services::URIService.parse(@resource.record_path).append_paths("active_storage_attachments", id, file.id).to_s
-  end
-
   def id
     field.id
   end

data/app/components/avo/fields/common/files/view_type/list_component.html.erb

@@ -0,0 +1,22 @@
+<div class="relative min-h-full max-w-full flex-1 flex">
+  <% if file.present? %>
+    <div class="flex gap-2 items-center max-w-full w-full">
+      <div class="flex-1 flex flex-row col-span-7 items-center text-gray-700 truncate">
+        <div class="rounded-full bg-slate-100 border border-gray-500 p-1.5 flex items-center justify-center">
+          <%= helpers.svg icon_for_file, class: "h-5 text-gray-600" %>
+        </div>
+        <p class="overflow-x-scroll items-center h-full p-2 whitespace-nowrap">
+          <%= file.filename %>
+        </p>
+      </div>
+      <div class="col-span-4 text-gray-700 flex-shrink-0 text-sm">
+        <%= helpers.number_to_human_size(file.byte_size) %>
+      </div>
+      <div class="flex space-x-2 justify-end col-span-1 flex-shrink-0">
+        <%= render Avo::Fields::Common::Files::ControlsComponent.new(field: field, file: file, resource: resource) %>
+      </div>
+    </div>
+  <% else %>
+    –
+  <% end %>
+</div>

data/app/components/avo/fields/common/files/view_type/list_component.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Avo::Fields::Common::Files::ViewType::ListComponent < Avo::Fields::Common::Files::ViewType::GridComponent
+  def icon_for_file
+    if is_image?
+      "photo"
+    elsif is_audio?
+      "speaker-wave"
+    elsif is_video?
+      "video-camera"
+    else
+      "document"
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 <%= field_wrapper **field_wrapper_args do %>
   <% if @field.value.present? %>
     <div class="mb-2">
-      <%= render Avo::Fields::Common::SingleFileViewerComponent.new resource: @resource, field: @field %>
+      <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
     </div>
   <% end %>
 

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

@@ -1,3 +1,3 @@
 <%= field_wrapper **field_wrapper_args do %>
-  <%= render Avo::Fields::Common::SingleFileViewerComponent.new resource: @resource, field: @field %>
+  <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
 <% end %>

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

@@ -1,5 +1,5 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
+<%= field_wrapper **field_wrapper_args, stacked: true do %>
+  <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 
   <% if can_upload_file? %>
     <div class="mt-2">

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

@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
+<%= field_wrapper **field_wrapper_args, stacked: true do %>
+  <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 <% end %>

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

@@ -11,6 +11,10 @@
         new_icon: 'grid-view-type',
         translation_key: 'avo.grid_view',
       },
+      list: {
+        new_view_type: 'list',
+        new_icon: 'queue-list',
+      },
     }
   %>
   <div class="flex">

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/lib/avo/fields/base_field.rb

@@ -73,7 +73,7 @@ module Avo
         @placeholder = args[:placeholder]
         @help = args[:help] || nil
         @default = args[:default] || nil
-        @visible = args[:visible] || true
+        @visible = args[:visible]
         @as_label = args[:as_label] || false
         @as_avatar = args[:as_avatar] || false
         @as_description = args[:as_description] || false
@@ -156,7 +156,9 @@ module Avo
       end
 
       def visible?
-        if visible.present? && visible.respond_to?(:call)
+        return true if visible.nil?
+
+        if visible.respond_to?(:call)
           visible.call resource: @resource
         else
           visible

data/lib/avo/fields/files_field.rb

@@ -6,6 +6,7 @@ module Avo
       attr_accessor :direct_upload
       attr_accessor :accept
       attr_reader :display_filename
+      attr_reader :hide_view_type_changer
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -15,6 +16,8 @@ module Avo
         @direct_upload = args[:direct_upload].present? ? args[:direct_upload] : false
         @accept = args[:accept].present? ? args[:accept] : nil
         @display_filename = args[:display_filename].nil? ? true : args[:display_filename]
+        @view_type = args[:view_type] || :grid
+        @hide_view_type_changer = args[:hide_view_type_changer]
       end
 
       def view_component_name
@@ -37,6 +40,14 @@ module Avo
 
         model
       end
+
+      def viewer_component
+        "Avo::Fields::Common::Files::ViewType::#{view_type.to_s.capitalize}Component".constantize
+      end
+
+      def view_type
+        (@resource.params.dig(:view_type) || @view_type).to_sym
+      end
     end
   end
 end

data/lib/avo/fields/id_field.rb

@@ -5,12 +5,13 @@ module Avo
 
       def initialize(id, **args, &block)
         args[:readonly] = true
-        args[:sortable] = true
 
         hide_on [:edit, :new]
 
         super(id, **args, &block)
 
+        add_boolean_prop args, :sortable, true
+
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.30.0" unless const_defined?(:VERSION)
+  VERSION = "2.30.1.pre1.pr1683" unless const_defined?(:VERSION)
 end

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

@@ -6386,6 +6386,14 @@ trix-toolbar .trix-button-group:not(:first-child){
   grid-column:1 / -1
 }
 
+.col-span-7{
+  grid-column:span 7 / span 7
+}
+
+.col-span-4{
+  grid-column:span 4 / span 4
+}
+
 .float-right{
   float:right
 }
@@ -6595,6 +6603,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   margin-bottom:0.25rem
 }
 
+.-mt-9{
+  margin-top:-2.25rem
+}
+
 .block{
   display:block
 }
@@ -6631,6 +6643,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   aspect-ratio:1 / 1
 }
 
+.aspect-video{
+  aspect-ratio:16 / 9
+}
+
 .h-36{
   height:9rem
 }
@@ -6711,10 +6727,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   height:2.25rem
 }
 
-.max-h-\[42rem\]{
-  max-height:42rem
-}
-
 .max-h-full{
   max-height:100%
 }
@@ -6998,10 +7010,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   gap:1.5rem
 }
 
-.gap-3{
-  gap:0.75rem
-}
-
 .gap-1{
   gap:0.25rem
 }
@@ -7066,12 +7074,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   margin-left:calc(0.75rem * calc(1 - var(--tw-space-x-reverse)))
 }
 
-.space-y-3 > :not([hidden]) ~ :not([hidden]){
-  --tw-space-y-reverse:0;
-  margin-top:calc(0.75rem * calc(1 - var(--tw-space-y-reverse)));
-  margin-bottom:calc(0.75rem * var(--tw-space-y-reverse))
-}
-
 .divide-y > :not([hidden]) ~ :not([hidden]){
   --tw-divide-y-reverse:0;
   border-top-width:calc(1px * calc(1 - var(--tw-divide-y-reverse)));
@@ -7111,6 +7113,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   overflow-x:auto
 }
 
+.overflow-x-scroll{
+  overflow-x:scroll
+}
+
 .truncate{
   overflow:hidden;
   text-overflow:ellipsis;
@@ -7561,6 +7567,11 @@ trix-toolbar .trix-button-group:not(:first-child){
   background-color:rgb(94 100 110 / var(--tw-bg-opacity))
 }
 
+.bg-slate-100{
+  --tw-bg-opacity:1;
+  background-color:rgb(241 245 249 / var(--tw-bg-opacity))
+}
+
 .bg-opacity-25{
   --tw-bg-opacity:0.25
 }
@@ -7601,6 +7612,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   padding:0.25rem
 }
 
+.p-1\.5{
+  padding:0.375rem
+}
+
 .px-1{
   padding-left:0.25rem;
   padding-right:0.25rem
@@ -9702,10 +9717,6 @@ trix-editor {
     grid-template-columns:repeat(4, minmax(0, 1fr))
   }
 
-  .xl\:grid-cols-3{
-    grid-template-columns:repeat(3, minmax(0, 1fr))
-  }
-
   .xl\:flex-row{
     flex-direction:row
   }
@@ -9764,8 +9775,4 @@ trix-editor {
   .\32xl\:grid-cols-6{
     grid-template-columns:repeat(6, minmax(0, 1fr))
   }
-
-  .\32xl\:grid-cols-4{
-    grid-template-columns:repeat(4, minmax(0, 1fr))
-  }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.30.0
+  version: 2.30.1.pre1.pr1683
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1371,8 +1371,14 @@ files:
 - app/components/avo/fields/common/boolean_check_component.rb
 - app/components/avo/fields/common/boolean_group_component.html.erb
 - app/components/avo/fields/common/boolean_group_component.rb
-- app/components/avo/fields/common/files_list_viewer_component.html.erb
-- app/components/avo/fields/common/files_list_viewer_component.rb
+- app/components/avo/fields/common/files/controls_component.html.erb
+- app/components/avo/fields/common/files/controls_component.rb
+- app/components/avo/fields/common/files/list_viewer_component.html.erb
+- app/components/avo/fields/common/files/list_viewer_component.rb
+- app/components/avo/fields/common/files/view_type/grid_component.html.erb
+- app/components/avo/fields/common/files/view_type/grid_component.rb
+- app/components/avo/fields/common/files/view_type/list_component.html.erb
+- app/components/avo/fields/common/files/view_type/list_component.rb
 - app/components/avo/fields/common/gravatar_viewer_component.html.erb
 - app/components/avo/fields/common/gravatar_viewer_component.rb
 - app/components/avo/fields/common/heading_component.html.erb
@@ -1381,8 +1387,6 @@ files:
 - app/components/avo/fields/common/key_value_component.rb
 - app/components/avo/fields/common/progress_bar_component.html.erb
 - app/components/avo/fields/common/progress_bar_component.rb
-- app/components/avo/fields/common/single_file_viewer_component.html.erb
-- app/components/avo/fields/common/single_file_viewer_component.rb
 - app/components/avo/fields/common/status_viewer_component.html.erb
 - app/components/avo/fields/common/status_viewer_component.rb
 - app/components/avo/fields/concerns/item_labels.rb
@@ -1700,6 +1704,7 @@ files:
 - config/credentials.yml.enc
 - config/i18n-tasks.yml
 - config/initializers/pagy.rb
+- config/master.key
 - config/routes.rb
 - config/spring.rb
 - db/factories.rb
@@ -1961,9 +1966,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.3
 signing_key: 

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

@@ -1,5 +0,0 @@
-<div class="relative py-3 grid xs:grid-cols-2 sm:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 gap-3 rounded-xl">
-  <% @field.value.attachments.each do |file| %>
-    <%= render Avo::Fields::Common::SingleFileViewerComponent.new field: @field, resource: @resource, file: file %>
-  <% end %>
-</div>

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

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-class Avo::Fields::Common::FilesListViewerComponent < ViewComponent::Base
-  def initialize(field:, resource:)
-    @field = field
-    @resource = resource
-  end
-end

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

@@ -1,57 +0,0 @@
-<div class="relative min-h-full max-w-full flex-1 flex flex-col justify-between space-y-3">
-  <% if file.present? %>
-    <div class="flex flex-col justify-between h-full">
-      <% if file.representable? && is_image? %>
-        <div class="max-h-[42rem] h-full flex">
-          <%= image_tag helpers.main_app.url_for(file), class: 'rounded-lg object-cover' %>
-        </div>
-      <% elsif is_audio? %>
-        <%= audio_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
-      <% elsif is_video? %>
-        <%= video_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
-      <% else %>
-        <div class="relative flex flex-col justify-evenly items-center px-2 rounded-lg border bg-white border-gray-500 min-h-24">
-          <div class="flex flex-col justify-center items-center w-full">
-            <%= helpers.svg 'document-text', class: 'h-10 text-gray-600 mb-2' %>
-          </div>
-        </div>
-      <% end %>
-      <% if field.display_filename %>
-        <span class="text-gray-500 mt-2 text-sm truncate" title="<%= file.filename %>"><%= file.filename %></span>
-      <% end %>
-    </div>
-    <div class="flex space-x-2">
-      <div class="flex">
-        <% if can_download_file? %>
-          <%= a_link Rails.application.routes.url_helpers.rails_blob_path(file, only_path: true, disposition: :attachment),
-            icon: 'heroicons/outline/download',
-            color: :primary,
-            download: true,
-            class: 'text-center',
-            title: t('avo.download_file'),
-            data: { tippy: :tooltip },
-            compact: true,
-            size: :xs %>
-        <% end %>
-      </div>
-      <div>
-        <% if can_delete_file? %>
-          <%= a_link destroy_path,
-            icon: 'heroicons/outline/trash',
-            color: :red,
-            compact: true,
-            size: :xs,
-            class: 'text-center',
-            title: t('avo.delete_file', item: file.filename),
-            data: {
-              turbo_method: :delete,
-              turbo_confirm: t('avo.are_you_sure'),
-              tippy: :tooltip
-            } %>
-        <% end %>
-      </div>
-    </div>
-  <% else %>
-    –
-  <% end %>
-</div>