avo 1.7.2 → 1.7.3.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76e6f84b0b7d8c9144994b898621dd99359875e7a32e26865c86034431031992
-  data.tar.gz: 8df9ac786016d2ba0ef2ca2071a4d9e3445a6d3e0db3d55fa4ac12aa49d1fe79
+  metadata.gz: e96f8c7b1a99eebd33b9062e2cc6af6a57318c3fad731efe977a14f223e4a85a
+  data.tar.gz: 2c6fef93d648146d920eefe4cf4e63077f93b38197416e78e2cf5974877f1578
 SHA512:
-  metadata.gz: 0ef42c3022b80c94f2fa5543321a737d7c89fe4a57ee81493fdd3c9cd068184c8107873985e9df3a0d8d33fef2ccf664f7bd70094349925a6b04f94375cb0e92
-  data.tar.gz: 68fa168d75070ff5dd08f6b5643ecf9efa73a003b5fb3968bb8b784594553cf76043a8598397cb6a392fcae958865f52f530126df3825df3f132656dbfe3b770
+  metadata.gz: 0c8db63eaf4002fb720624beba6e87f1251da632e51a1c589ae0c2501111adea74b250c04f02d9f4e9479c138d364ab7082950393807821bc45c7d1977061e93
+  data.tar.gz: 1a065511c9883fc0d350bbfa65315f1483745d6324059b484f89cea75bdbb86473f24344dbbb9ebffd2cc442296438eb00df8e011ebd661c1399aa1e5d701937

data/Gemfile

@@ -26,7 +26,7 @@ gem "pundit"
 # Dependencies for dummy_app
 #
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem "rails", "~> 6.0.2", ">= 6.0.2.2"
+gem "rails", "~> 6.1.0"
 # Use postgresql as the database for Active Record
 gem "pg", ">= 0.18", "< 2.0"
 # Use Puma as the app server
@@ -128,3 +128,5 @@ gem 'breadcrumbs_on_rails'
 gem 'manifester'
 
 gem 'ransack'
+
+gem "aws-sdk-s3", require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.7.2)
+    avo (1.7.3.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -21,38 +21,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.7)
-      actionpack (= 6.0.3.7)
+    actioncable (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionmailbox (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
+    actionmailer (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.7)
-      actionview (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.3.2)
+      actionview (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actiontext (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionview (6.1.3.2)
+      activesupport (= 6.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -60,25 +62,27 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    activejob (6.0.3.7)
-      activesupport (= 6.0.3.7)
+    activejob (6.1.3.2)
+      activesupport (= 6.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activerecord (6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activestorage (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activerecord (6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activestorage (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       marcel (~> 1.0.0)
-    activesupport (6.0.3.7)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     appraisal (2.4.0)
@@ -86,6 +90,22 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.465.0)
+    aws-sdk-core (3.114.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.43.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.95.1)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.3)
+      aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.16)
     bindex (0.8.1)
     bootsnap (1.7.3)
@@ -157,6 +177,7 @@ GEM
       i18n
     jbuilder (2.10.1)
       activesupport (>= 5.0.0)
+    jmespath (1.4.0)
     launchy (2.5.0)
       addressable (~> 2.7)
     listen (3.5.1)
@@ -178,16 +199,16 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
     mini_magick (4.11.0)
-    mini_mime (1.1.0)
-    mini_portile2 (2.5.1)
+    mini_mime (1.0.3)
+    mini_portile2 (2.5.3)
     minitest (5.14.4)
     msgpack (1.4.2)
     multi_xml (0.6.0)
     nio4r (2.5.7)
-    nokogiri (1.11.5)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    nokogiri (1.11.5-x86_64-linux)
+    nokogiri (1.11.7-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (3.13.0)
@@ -206,20 +227,20 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.7)
-      actioncable (= 6.0.3.7)
-      actionmailbox (= 6.0.3.7)
-      actionmailer (= 6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actiontext (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.7)
+    rails (6.1.3.2)
+      actioncable (= 6.1.3.2)
+      actionmailbox (= 6.1.3.2)
+      actionmailer (= 6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actiontext (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      bundler (>= 1.15.0)
+      railties (= 6.1.3.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -230,12 +251,12 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    railties (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      thor (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.3)
     ransack (2.4.2)
@@ -325,19 +346,18 @@ GEM
       rails (>= 6.0.0)
     test-prof (0.12.2)
     thor (1.1.0)
-    thread_safe (0.3.6)
     tilt (2.0.10)
     turbo-rails (0.5.9)
       rails (>= 6.0.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
     unicode_utils (1.4.0)
-    view_component (2.32.0)
+    view_component (2.33.0)
       activesupport (>= 5.0.0, < 7.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.0.4)
+    web-console (4.1.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
@@ -355,7 +375,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
@@ -371,6 +391,7 @@ DEPENDENCIES
   addressable
   appraisal
   avo!
+  aws-sdk-s3
   bootsnap (>= 1.4.2)
   breadcrumbs_on_rails
   bump
@@ -396,7 +417,7 @@ DEPENDENCIES
   pg (>= 0.18, < 2.0)
   puma (~> 5.3.1)
   pundit
-  rails (~> 6.0.2, >= 6.0.2.2)
+  rails (~> 6.1.0)
   rails-controller-testing
   ransack
   rspec-rails (~> 4.0.0)

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

@@ -17,7 +17,7 @@
       <%= a_link helpers.main_app.url_for(@file), color: 'indigo', download: true, class: 'text-center', size: :xs do %>
         <%= helpers.svg 'download' %> <span class="hidden lg:block lg:flex-1"><%= t('avo.download_file') %></span>
       <% end %>
-      <%= a_link "#{Avo.configuration.root_path}/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id
+      <%= a_link "#{Avo::App.root_path}/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id
       }/active_storage_attachments/#{@id}/#{@file.id}", color: :red, variant: :outlined, size: :xs, class: 'text-center', 'data-turbo-frame': 'destroy_attachment_form', data: { confirm: t('avo.are_you_sure')} do %>
         <%= helpers.svg 'trash' %> <span class="hidden lg:block lg:flex-1"><%= t 'avo.delete_file', item: @file.filename %></span>
       <% end %>

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

@@ -17,7 +17,7 @@
       <%= a_link helpers.main_app.url_for(@file), color: 'indigo', download: true, class: '', size: :md do %>
         <%= helpers.svg 'download' %> <%= t('avo.download_file') %>
       <% end %>
-      <%= a_link "#{Avo.configuration.root_path}/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id
+      <%= a_link "#{Avo::App.root_path}/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id
       }/active_storage_attachments/#{@id}/#{@file.id}", color: :red, variant: :outlined, size: :md, class: '', 'data-turbo-frame': 'destroy_attachment_form', data: { confirm: t('avo.are_you_sure')} do %>
         <%= helpers.svg 'trash' %> <%= t 'avo.delete_file', item: @file.filename %>
       <% end %>

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

@@ -1,7 +1,7 @@
 <%= index_field_wrapper field: @field do %>
   <% if @field.value.present? %>
     <% if @field.value.attached? && @field.value.representable? && @field.is_image %>
-      <%= link_to_if @field.link_to_resource, image_tag(@field.variant, class: 'max-h-full'), resource_path, class: 'block h-8' %>
+      <%= link_to_if @field.link_to_resource, image_tag(helpers.main_app.url_for(@field.value), class: 'max-h-full'), resource_path, class: 'block h-8' %>
     <% else %>
       <%= @field.value.filename %>
     <% end %>

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

@@ -6,6 +6,9 @@
     data-resource-id="<%= @resource.model.id %>"
     data-attachments-disabled="<%= @field.attachments_disabled %>"
     data-attachment-key="<%= @field.attachment_key %>"
+    data-hide-attachment-filename="<%= @field.hide_attachment_filename %>"
+    data-hide-attachment-filesize="<%= @field.hide_attachment_filesize %>"
+    data-hide-attachment-url="<%= @field.hide_attachment_url %>"
   >
     <% trix_id = "trix_#{@resource.name.underscore}_#{@field.id}" %>
     <trix-editor data-trix-field-target="editor" input="<%= trix_id %>" placeholder="<%= @field.placeholder %>"><%== @field.value %></trix-editor>

data/app/components/avo/index/grid_item_component.html.erb

@@ -10,18 +10,16 @@
       <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
     <% elsif cover.type == 'file' %>
       <% if cover.value.attached? && cover.value.representable? %>
-        <%= link_to_if cover.link_to_resource, image_tag(cover.variant(resize_to_limit: [480, 480]), class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+        <%= link_to_if cover.link_to_resource, image_tag(helpers.main_app.url_for(cover.value.variant(resize_to_limit: [480, 480])), class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
       <% else %>
         <div class="absolute bg-gray-100 w-full h-full">
           <%= helpers.svg 'avocado', class: 'relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2' %>
         </div>
       <% end %>
+    <% elsif cover.value.present? %>
+      <%= link_to_if cover.link_to_resource, image_tag(cover.value, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
     <% else %>
-      <% if cover.value.present? %>
-        <%= link_to_if cover.link_to_resource, image_tag(cover.value, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
-      <% else %>
-        <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
-      <% end %>
+      <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
     <% end %>
   </div>
   <div class="grid grid-cols-1 place-content-between p-4 h-full">

data/app/components/avo/views/resource_index_component.rb

@@ -77,7 +77,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def attach_path
-    "#{Avo.configuration.root_path}#{request.env["PATH_INFO"]}/new"
+    "#{Avo::App.root_path}#{request.env["PATH_INFO"]}/new"
   end
 
   def detach_path

data/app/controllers/avo/application_controller.rb

@@ -17,7 +17,7 @@ module Avo
     add_flash_types :info, :warning, :success, :error
 
     def init_app
-      Avo::App.init request: request, context: context, current_user: _current_user
+      Avo::App.init request: request, context: context, root_path: avo.root_path.delete_suffix("/"), current_user: _current_user
 
       @license = Avo::App.license
     end
@@ -78,6 +78,7 @@ module Avo
           existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
         end
       rescue; end
+
       avo.send :"resources_#{model.model_name.route_key}_path", **existing_params, **args
     end
 
@@ -91,7 +92,7 @@ module Avo
           existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
         end
       rescue; end
-      Addressable::Template.new("#{Avo.configuration.root_path}/resources/#{@parent_resource.model.model_name.route_key}/#{@parent_resource.model.id}/#{@resource.route_key}{?query*}")
+      Addressable::Template.new("#{Avo::App.root_path}/resources/#{@parent_resource.model.model_name.route_key}/#{@parent_resource.model.id}/#{@resource.route_key}{?query*}")
         .expand({query: {**existing_params, **args}})
         .to_str
     end
@@ -103,7 +104,7 @@ module Avo
     end
 
     def resource_attach_path(model_name, model_id, related_name, related_id = nil)
-      path = "#{Avo.configuration.root_path}/resources/#{model_name}/#{model_id}/#{related_name}/new"
+      path = "#{Avo::App.root_path}/resources/#{model_name}/#{model_id}/#{related_name}/new"
 
       path += "/#{related_id}" if related_id.present?
 
@@ -111,7 +112,7 @@ module Avo
     end
 
     def resource_detach_path(model_name, model_id, related_name, related_id = nil)
-      path = "#{Avo.configuration.root_path}/resources/#{model_name}/#{model_id}/#{related_name}"
+      path = "#{Avo::App.root_path}/resources/#{model_name}/#{model_id}/#{related_name}"
 
       path += "/#{related_id}" if related_id.present?
 
@@ -147,7 +148,8 @@ module Avo
     end
 
     def set_model
-      @model = eager_load_files(@resource, @resource.model_class).find params[:id]
+      # @model = eager_load_files(@resource, @resource.model_class).find params[:id]
+      @model = @resource.model_class.find params[:id]
     end
 
     def set_related_model
@@ -179,7 +181,7 @@ module Avo
 
       begin
         request.path
-          .match(/\/?#{Avo.configuration.root_path.delete('/')}\/resources\/([a-z1-9\-_]*)\/?/mi)
+          .match(/\/?#{Avo::App.root_path.delete('/')}\/resources\/([a-z1-9\-_]*)\/?/mi)
           .captures
           .first
       rescue
@@ -273,15 +275,15 @@ module Avo
     end
 
     def on_root_path
-      [Avo.configuration.root_path, "#{Avo.configuration.root_path}/"].include?(request.original_fullpath)
+      [Avo::App.root_path, "#{Avo::App.root_path}/"].include?(request.original_fullpath)
     end
 
     def on_resources_path
-      request.original_url.match?(/.*#{Avo.configuration.root_path}\/resources\/.*/)
+      request.original_url.match?(/.*#{Avo::App.root_path}\/resources\/.*/)
     end
 
     def on_api_path
-      request.original_url.match?(/.*#{Avo.configuration.root_path}\/avo_api\/.*/)
+      request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
     end
   end
 end