avo 2.30.1.pre4.pr1683 → 2.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7026eb5ccd2fa76aab49f686e6e3d87e310e54ed6d220aab367c87283690d29e
-  data.tar.gz: 3de5de591bb61c2d022eb71e25b08cceb225dc5af6f92ba2d4431abf594bbe45
+  metadata.gz: fc6bc41d1c4845492b9ee785b1ccd4895d0369ec54d2b307c67835a112059923
+  data.tar.gz: a04214b31f49e408ecf64166c126dd8a114543f4c3ad01383f33ba1d7216c88d
 SHA512:
-  metadata.gz: 005c54601761b2d69acea075c89a433c9a170d591db6e7d3cfdfd6b7cc75d36d87eee9eedec207aea59413c6ebc9efebed14896e5ed2a51eb46bfbd532a8c4e7
-  data.tar.gz: 89376982016bd362d2148cd57244fe9e8c3b5e998f081f3b34557e484a09e55c7d7370a22d2f7047bb418813c5edc7b7b124284a53a7eb58c59481183cb0229f
+  metadata.gz: e36a294bc70cd7568ea15c7e5d4323b1d261bfeaf7295ae2439cf581bef67ea0efcebe9995d23bfb416904e89810342df73d20591aa6790d128593ffceca7a16
+  data.tar.gz: d2eac35c9568ed230c05155823be7f52add0e4a86fa0f43ec85dbe2c69e84e5cb6188b7799714c739922269ba16b4919e3a0e7e7eb5f8d79cd4220669e0671ba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.30.1.pre4.pr1683)
+    avo (2.30.2)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/assets/svgs/failed_to_load.svg

@@ -9,6 +9,5 @@
 <defs>
 <stop stop-color="#E3ECFA"/>
 <stop offset="1" stop-color="#DAE7FF"/>
-</linearGradient>
 </defs>
 </svg>

data/app/assets/svgs/grid-empty-state.svg

@@ -22,7 +22,6 @@
 <feColorMatrix type="matrix" values="0 0 0 0 0.788235 0 0 0 0 0.803922 0 0 0 0 0.85098 0 0 0 0.349 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_577_1090"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_577_1090" result="shape"/>
-</filter>
 <filter id="filter1_d_577_1090" x="38.6401" y="0" width="170.72" height="78.1333" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>

data/app/assets/svgs/table-empty-state.svg

@@ -51,6 +51,5 @@
 </filter>
 <stop stop-color="#E3ECFA"/>
 <stop offset="1" stop-color="#DAE7FF"/>
-</linearGradient>
 </defs>
 </svg>

data/app/components/avo/field_wrapper_component.html.erb

@@ -11,7 +11,7 @@
     <% if on_edit? && field.is_required? %> <span class="text-red-600 ml-1">*</span> <% end %>
   </div>
   <div class="flex-1 flex flex-row md:min-h-inherit py-2 <% if stacked? %> pb-4 <% else %><% end %> px-6 <%= @field.get_html(:classes, view: view, element: :content) %>" data-slot="value">
-    <div class="self-center w-full <% if full_width? || compact? || stacked? %> <% else %> md:w-8/12 <% end %>">
+    <div class="self-center w-full <% unless full_width? || compact? || stacked? %> md:w-8/12 <% end %>">
       <% if on_show? %>
         <% if field.value.blank? and dash_if_blank %>
           —

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

@@ -2,12 +2,18 @@
   <%= turbo_frame_tag @field.id do %>
     <% unless @field.hide_view_type_switcher %>
       <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 } %>
+        <%= render partial: 'avo/partials/view_toggle_button',
+          locals: {
+            available_view_types: available_view_types,
+            view_type: 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 %>
+        <%= render view_type_component(file) %>
       <% end %>
     </div>
   <% end %>

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

@@ -3,7 +3,7 @@
 class Avo::Fields::Common::Files::ListViewerComponent < ViewComponent::Base
   include Turbo::FramesHelper
 
-  attr_reader :field
+  attr_reader :field, :resource
 
   def initialize(field:, resource:)
     @field = field
@@ -13,7 +13,7 @@ class Avo::Fields::Common::Files::ListViewerComponent < ViewComponent::Base
   def classes
     base_classes = "py-4 rounded-xl max-w-full"
 
-    view_type_classes = if @field.view_type == :list
+    view_type_classes = if 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"
@@ -29,4 +29,13 @@ class Avo::Fields::Common::Files::ListViewerComponent < ViewComponent::Base
   def available_view_types
     [:list, :grid]
   end
+
+  def view_type_component(file)
+    component = "Avo::Fields::Common::Files::ViewType::#{view_type.to_s.capitalize}Component".constantize
+    component.new(field: field, resource: resource, file: file)
+  end
+
+  def view_type
+    (resource.params.dig(:view_type) || field.view_type).to_sym
+  end
 end

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

@@ -1,4 +1,4 @@
-<div class="relative min-h-full max-w-full flex-1 flex flex-col justify-between space-y-2">
+<div id="<%= dom_id file %>" 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? %>

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

@@ -1,4 +1,4 @@
-<div class="relative min-h-full max-w-full flex-1 flex">
+<div id="<%= dom_id file %>" class="relative min-h-full max-w-full flex-1 flex">
   <% if file.present? %>
     <div class="grid grid-cols-6 gap-2 items-center max-w-full w-full">
       <div class="col-span-4 flex-1 flex flex-row items-center text-gray-700 overflow-x-auto mac-styled-scrollbar ">

data/app/controllers/avo/attachments_controller.rb

@@ -23,17 +23,24 @@ module Avo
     end
 
     def destroy
-      raise Avo::NotAuthorizedError.new unless authorized_to :delete
+      if authorized_to :delete
+        attachment = ActiveStorage::Attachment.find(params[:attachment_id])
 
-      attachment = ActiveStorage::Attachment.find(params[:attachment_id])
-      path = resource_path(model: @model, resource: @resource)
+        flash[:notice] = if attachment.present?
+          @destroyed = attachment.destroy
 
-      if attachment.present?
-        attachment.destroy
-
-        redirect_to params[:referrer] || path, notice: t("avo.attachment_destroyed")
+          t("avo.attachment_destroyed")
+        else
+          t("avo.failed_to_find_attachment")
+        end
       else
-        redirect_back fallback_location: path, notice: t("avo.failed_to_find_attachment")
+        flash[:notice] = t("avo.not_authorized")
+      end
+
+      respond_to do |format|
+        format.turbo_stream do
+          render "destroy"
+        end
       end
     end
 

data/app/helpers/avo/application_helper.rb

@@ -111,6 +111,14 @@ module Avo
       Avo::Engine.routes.find_script_name(params.permit!.to_h.symbolize_keys)
     end
 
+    def decode_filter_params(encoded_params)
+      Avo::Filters::BaseFilter.decode_filters(encoded_params)
+    end
+
+    def encode_filter_params(filter_params)
+      Avo::Filters::BaseFilter.encode_filters(filter_params)
+    end
+
     private
 
     # Taken from the original library

data/app/views/avo/attachments/destroy.turbo_stream.erb

@@ -0,0 +1,7 @@
+<%= turbo_stream.remove dom_id(@destroyed) if @destroyed.present? %>
+
+<turbo-stream action="append" target="alerts">
+  <template>
+    <%= render Avo::FlashAlertsComponent.new flashes: flash %>
+  </template>
+</turbo-stream>

data/db/factories.rb

@@ -42,6 +42,20 @@ FactoryBot.define do
     progress { Faker::Number.between(from: 0, to: 100) }
   end
 
+  trait :with_files do
+    after(:create) do |project|
+      ["watch.jpg", "dummy-video.mp4"].each do |filename|
+        file = Rails.root.join("db", "seed_files", filename)
+        project.files.attach(io: file.open, filename: filename)
+      end
+
+      ["dummy-file.txt", "dummy-audio.mp3"].each do |filename|
+        file = Avo::Engine.root.join("spec", "dummy", filename)
+        project.files.attach(io: file.open, filename: filename)
+      end
+    end
+  end
+
   factory :comment do
     body { Faker::Lorem.paragraphs(number: rand(4...10)).join(" ") }
     posted_at { Time.now - rand(10...365).days }

data/lib/avo/configuration.rb

@@ -71,7 +71,7 @@ module Avo
       @id_links_to_resource = false
       @full_width_container = false
       @full_width_index_view = false
-      @cache_resources_on_index_view = false
+      @cache_resources_on_index_view = Avo::PACKED
       @cache_resource_filters = false
       @context = proc {}
       @initial_breadcrumbs = proc {

data/lib/avo/fields/base_field.rb

@@ -40,7 +40,6 @@ module Avo
       attr_reader :stacked
 
       # Private options
-      attr_reader :updatable
       attr_reader :computable # if allowed to be computable
       attr_reader :computed # if block is present
       attr_reader :computed_value # the value after computation
@@ -257,6 +256,10 @@ module Avo
         !visible_in_reflection?
       end
 
+      def updatable
+        @updatable && visible?
+      end
+
       private
 
       def model_or_class(model)

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 :view_type
       attr_reader :hide_view_type_switcher
 
       def initialize(id, **args, &block)
@@ -40,14 +41,6 @@ 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/filters/base_filter.rb

@@ -21,6 +21,10 @@ module Avo
           {}
         end
 
+        def encode_filters(filter_params)
+          Base64.encode64(filter_params.to_json)
+        end
+
         def get_empty_message
           empty_message || I18n.t("avo.no_options_available")
         end

data/lib/avo/version.rb

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

data/lib/generators/avo/tailwindcss/install_generator.rb

@@ -21,7 +21,7 @@ module Generators
           end
 
           if Rails.root.join("Procfile.dev").exist?
-            append_to_file "Procfile.dev", "avo_css: bin/rails avo:tailwindcss:watch\n"
+            append_to_file "Procfile.dev", "avo_css: yarn avo:tailwindcss --watch\n"
           else
             say "Add default Procfile.dev"
             copy_file template_path("Procfile.dev"), "Procfile.dev"
@@ -38,6 +38,9 @@ module Generators
 
           say "Adding the CSS asset to the partial"
           prepend_to_file Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb"), "<%= stylesheet_link_tag \"avo.tailwind.css\", media: \"all\" %>"
+
+          say "Ensure you have the following script in your package.json file.", :yellow
+          say %("scripts": { "avo:tailwindcss": "tailwindcss -i ./app/assets/stylesheets/avo.tailwind.css -o ./app/assets/builds/avo.tailwind.css --minify" }), :green
         end
 
         no_tasks do

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

@@ -47,7 +47,7 @@ Avo.configure do |config|
   # config.per_page_steps = [12, 24, 48, 72]
   # config.via_per_page = 8
   # config.id_links_to_resource = false
-  # config.cache_resources_on_index_view = false
+  # config.cache_resources_on_index_view = true
   ## permanent enable or disable cache_resource_filters, default value is false
   # config.cache_resource_filters = false
   ## provide a lambda to enable or disable cache_resource_filters per user/resource.

data/lib/generators/avo/templates/tailwindcss/Procfile.dev

@@ -1,2 +1,2 @@
 web: bin/rails server -p 3000
-avo_css: bin/rails avo:tailwindcss:watch
+avo_css: yarn avo:tailwindcss --watch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.30.1.pre4.pr1683
+  version: 2.30.2
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1646,6 +1646,7 @@ files:
 - app/views/avo/actions/keep_modal_open.turbo_stream.erb
 - app/views/avo/actions/show.html.erb
 - app/views/avo/associations/new.html.erb
+- app/views/avo/attachments/destroy.turbo_stream.erb
 - app/views/avo/base/_boolean_filter.html.erb
 - app/views/avo/base/_multiple_select_filter.html.erb
 - app/views/avo/base/_select_filter.html.erb
@@ -1704,7 +1705,6 @@ 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
@@ -1966,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: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.3
 signing_key: 

data/config/master.key

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