avo 1.18.2.pre.0 → 1.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88cca5eb20b3bf2b5ffec2d183425a17397af2e2348f75f77b04eba1b7273f42
-  data.tar.gz: 95f9929e160e72e1d3b1f2916e234c5aca8831951af44b262552c29418435776
+  metadata.gz: 3a9e6624587295b46f8f052da4cb2b6ffb8faff958d1de9ab0fe2eb98a58c05c
+  data.tar.gz: 1010b48e463a388d0b20e3348de1c49f8468d63c2a14d78fe9ca4a9ad5c87e3e
 SHA512:
-  metadata.gz: 84865027b7970efac44ab3899268123af6d081b59cd28781a26c5075c7ccff3197b6546f70bed48aa202ecdee3d7586f4356863908f42a462bf35871cd0d59ae
-  data.tar.gz: 5dd638cd5699db08ab642cfc00523ff19f9cb8338408d9b38ba0b167ec23fab209529367be43f87ac117f2f9173fe498e5cdc37ec8533202135902a6b4a80b75
+  metadata.gz: d18de447e0138f28d1ceb806bf16968b88dc81c0f1b097fee892bda8b19259a8df939c3fe3060e963a0f1f04e2696f3706b1f68a42b92c2e1f53a48e09788518
+  data.tar.gz: 91d9ec101ce25c6dba5300a054476ef8fef432cfe18d6140b0f6ff92a73be95fca213a549af6c38bfd7e3f392822ad6feaeea2fff77f208395137f063e3b7594

data/Gemfile

@@ -131,6 +131,6 @@ gem 'ransack'
 
 gem 'friendly_id', '~> 5.4.0'
 
-gem "aws-sdk-s3", require: false
+gem 'aws-sdk-s3', require: false
 
 gem 'net-smtp', require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.18.2.pre.0)
+    avo (1.18.2)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -227,10 +227,8 @@ GEM
     nokogiri (1.13.0)
       mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
-    nokogiri (1.13.0-x86_64-linux)
-      racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (5.7.1)
+    pagy (5.7.3)
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)

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

@@ -1,3 +1,7 @@
 <%= index_field_wrapper field: @field do %>
-  <%= link_to_if @field.link_to_resource, @field.value, resource_path %>
+  <% if @field.as_html %>
+    <%== @field.value %>
+  <% else %>
+    <%= link_to_if @field.link_to_resource, @field.value, resource_path %>
+  <% end %>
 <% end %>

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

@@ -1,3 +1,7 @@
 <%= show_field_wrapper field: @field, index: @index do %>
-  <%= @field.value %>
+  <% if @field.as_html %>
+    <%== @field.value %>
+  <% else %>
+    <%= @field.value %>
+  <% end %>
 <% end %>

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

@@ -1,4 +1,6 @@
-<div <% if main_app.respond_to?(:destroy_user_session_path) %> data-controller="toggle-panel" <% end %>>
+<% destroy_user_session_path = "destroy_#{Avo.configuration.current_user_resource_name}_session_path".to_sym %>
+
+<div <% if main_app.respond_to?(destroy_user_session_path) %> data-controller="toggle-panel" <% end %>>
   <a href="javascript:void(0);" class="flex items-center cursor-pointer font-semibold text-gray-700" data-action="click->toggle-panel#togglePanel">
     <% if _current_user.respond_to?(:avatar) &&  _current_user.avatar.present? %>
       <%= image_tag _current_user.avatar, class: "h-12 rounded-full border-4 border-white mr-1" %>
@@ -10,14 +12,14 @@
     <% else %>
       Avo user
     <% end %>
-    <% if main_app.respond_to?(:destroy_user_session_path) %>
+    <% if main_app.respond_to?(destroy_user_session_path) %>
       <%= svg 'chevron-down', class: "ml-1 h-4" %>
     <% end %>
   </a>
 
-  <% if main_app.respond_to?(:destroy_user_session_path) %>
-    <div class="hidden absolute inset-auto inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
-      <%= button_to t('avo.sign_out'), main_app.destroy_user_session_path, method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
+  <% if main_app.respond_to?(destroy_user_session_path) %>
+    <div class="hidden absolute inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
+      <%= button_to t('avo.sign_out'), main_app.send(:destroy_user_session_path), method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
     </div>
   <% end %>
 </div>

data/lib/avo/app.rb

@@ -32,7 +32,11 @@ module Avo
 
         # Set the current host for ActiveStorage
         begin
-          ActiveStorage::Current.url_options = request.base_url
+          if Rails::VERSION::MAJOR === 6
+            ActiveStorage::Current.host = request.base_url
+          elsif Rails::VERSION::MAJOR === 7
+            ActiveStorage::Current.url_options = request.base_url
+          end
         rescue => exception
           Rails.logger.debug "[Avo] Failed to set ActiveStorage::Current.url_options, #{exception.inspect}"
         end
@@ -121,8 +125,8 @@ module Avo
 
       def get_available_resources(user = nil)
         resources.select do |resource|
-            Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
-          end
+          Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
+        end
           .sort_by { |r| r.name }
       end
 
@@ -145,7 +149,7 @@ module Avo
             # remove the leading underscore (_)
             filename[0] = ""
             # remove the extension
-            filename.gsub!('.html.erb', '')
+            filename.gsub!(".html.erb", "")
             filename
           end
       end

data/lib/avo/configuration.rb

@@ -25,6 +25,7 @@ module Avo
     attr_accessor :search_debounce
     attr_accessor :view_component_path
     attr_accessor :display_license_request_timeout_error
+    attr_accessor :current_user_resource_name
 
     def initialize
       @root_path = "/avo"
@@ -62,6 +63,7 @@ module Avo
       @search_debounce = 300
       @view_component_path = "app/components"
       @display_license_request_timeout_error = true
+      @current_user_resource_name = "user"
     end
 
     def locale_tag

data/lib/avo/fields/text_field.rb

@@ -2,11 +2,13 @@ module Avo
   module Fields
     class TextField < BaseField
       attr_reader :link_to_resource
+      attr_reader :as_html
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @as_html = args[:as_html].present? ? args[:as_html] : false
       end
     end
   end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.18.2.pre.0"
+  VERSION = "1.18.2"
 end