avo 2.28.0 → 2.28.2.pre.pr1642

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 793c8545f234434ece6d95719bbc92501755c47c27515996bae6bd47c8668da8
-  data.tar.gz: 528f58dc08e61cdcb2d9d2bcc48b9341793c47d44fdc7b71c9999318aef845d0
+  metadata.gz: 2afd7fab61f56b5df63d0776f412e50efbf64bb0e45f9d011ec03f21978581c3
+  data.tar.gz: 69ea4d9a6097b88268f6058f0978a9ff938876d0c6837f41e5896411a2447db0
 SHA512:
-  metadata.gz: 90c629713202b14315db0975c1ebe5cc34c2c5f8f9c9e2509f9d6f05da199ee8b645cc55cc4da6f8a78c4197c59b3c5207b4d00432516698fa068f9490bfb5d8
-  data.tar.gz: ea1c21161d42a030d788a0cc3d92dccf5c551de9f466c2cc830a5035d9d1601fc2aee8ec83f7a1c1583060b01236b9adfad3433cd3512a7c04be7768cee3eeb5
+  metadata.gz: 3a324a98e38853c7b2cb4339f6c8d8c84efd7d4668248c1fd6e360f0fe7827a537108909c965241a080491fb6b18ac2d39c6b4e536de35708a495eb0484c0927
+  data.tar.gz: 0ddeccf56e54a0cd30214d69c1a02182d909b8731bf98ee95b4548ab1734ee1ff6c5b7d361b64e05a163a2cb0e957dfdcef88b3c156b7bc129ff06a452c4d90a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.28.0)
+    avo (2.28.2.pre.pr1642)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -19,40 +19,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.2)
-      actionpack (= 6.1.7.2)
-      activesupport (= 6.1.7.2)
+    actioncable (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.2)
-      actionpack (= 6.1.7.2)
-      activejob (= 6.1.7.2)
-      activerecord (= 6.1.7.2)
-      activestorage (= 6.1.7.2)
-      activesupport (= 6.1.7.2)
+    actionmailbox (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activestorage (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.2)
-      actionpack (= 6.1.7.2)
-      actionview (= 6.1.7.2)
-      activejob (= 6.1.7.2)
-      activesupport (= 6.1.7.2)
+    actionmailer (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      actionview (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.2)
-      actionview (= 6.1.7.2)
-      activesupport (= 6.1.7.2)
+    actionpack (6.1.7.3)
+      actionview (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       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.1.7.2)
-      actionpack (= 6.1.7.2)
-      activerecord (= 6.1.7.2)
-      activestorage (= 6.1.7.2)
-      activesupport (= 6.1.7.2)
+    actiontext (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activestorage (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.2)
-      activesupport (= 6.1.7.2)
+    actionview (6.1.7.3)
+      activesupport (= 6.1.7.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -62,22 +62,22 @@ GEM
       addressable
     active_median (0.3.3)
       activesupport (>= 5.2)
-    activejob (6.1.7.2)
-      activesupport (= 6.1.7.2)
+    activejob (6.1.7.3)
+      activesupport (= 6.1.7.3)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.2)
-      activesupport (= 6.1.7.2)
-    activerecord (6.1.7.2)
-      activemodel (= 6.1.7.2)
-      activesupport (= 6.1.7.2)
-    activestorage (6.1.7.2)
-      actionpack (= 6.1.7.2)
-      activejob (= 6.1.7.2)
-      activerecord (= 6.1.7.2)
-      activesupport (= 6.1.7.2)
+    activemodel (6.1.7.3)
+      activesupport (= 6.1.7.3)
+    activerecord (6.1.7.3)
+      activemodel (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
+    activestorage (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.2)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -142,7 +142,7 @@ GEM
       xpath (~> 3.2)
     chartkick (4.2.1)
     childprocess (4.1.0)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     countries (4.2.3)
       i18n_data (~> 0.16.0)
       sixarm_ruby_unaccent (~> 1.1)
@@ -239,7 +239,7 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.8.0.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -263,15 +263,15 @@ GEM
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.1.3)
+    net-protocol (0.2.1)
       timeout
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.10)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (6.0.2)
@@ -288,23 +288,23 @@ GEM
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     racc (1.6.2)
-    rack (2.2.6.3)
-    rack-test (2.0.2)
+    rack (2.2.6.4)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.2)
-      actioncable (= 6.1.7.2)
-      actionmailbox (= 6.1.7.2)
-      actionmailer (= 6.1.7.2)
-      actionpack (= 6.1.7.2)
-      actiontext (= 6.1.7.2)
-      actionview (= 6.1.7.2)
-      activejob (= 6.1.7.2)
-      activemodel (= 6.1.7.2)
-      activerecord (= 6.1.7.2)
-      activestorage (= 6.1.7.2)
-      activesupport (= 6.1.7.2)
+    rails (6.1.7.3)
+      actioncable (= 6.1.7.3)
+      actionmailbox (= 6.1.7.3)
+      actionmailer (= 6.1.7.3)
+      actionpack (= 6.1.7.3)
+      actiontext (= 6.1.7.3)
+      actionview (= 6.1.7.3)
+      activejob (= 6.1.7.3)
+      activemodel (= 6.1.7.3)
+      activerecord (= 6.1.7.3)
+      activestorage (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.2)
+      railties (= 6.1.7.3)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -318,9 +318,9 @@ GEM
     rails-i18n (7.0.5)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (6.1.7.2)
-      actionpack (= 6.1.7.2)
-      activesupport (= 6.1.7.2)
+    railties (6.1.7.3)
+      actionpack (= 6.1.7.3)
+      activesupport (= 6.1.7.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -412,7 +412,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     test-prof (1.0.10)
     thor (1.2.1)
-    timeout (0.3.0)
+    timeout (0.3.2)
     turbo-rails (1.4.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
@@ -444,7 +444,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby

data/app/components/avo/views/resource_index_component.html.erb

@@ -31,7 +31,7 @@
     <% end %>
     <% c.body do %>
       <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 py-4 <%= 'hidden' if @resource.search_query.nil? && @filters.empty? && available_view_types.count <= 1 %>">
-        <% unless hide_search_input %>
+        <% if show_search_input %>
           <div class="flex items-center px-4 w-64">
             <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key, via_reflection: via_reflection} %>
           </div>

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

@@ -124,10 +124,19 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @resource.resource_description
   end
 
-  def hide_search_input
-    return true unless @resource.search_query.present?
+  def show_search_input
+    return false unless authorized_to_search?
+    return false unless @resource.search_query.present?
+    return false if field&.hide_search_input
 
-    field&.hide_search_input || false
+    true
+  end
+
+  def authorized_to_search?
+    # Hide the search if the authorization prevents it
+    return true unless @resource.authorization.has_action_method?("search")
+
+    @resource.authorization.authorize_action("search", raise_exception: false)
   end
 
   private

data/app/controllers/avo/search_controller.rb

@@ -27,7 +27,8 @@ module Avo
       resources
         .map do |resource|
           # Apply authorization
-          next unless @authorization.set_record(resource.model_class).authorize_action(:index, raise_exception: false)
+          next unless @authorization.set_record(resource.model_class).authorize_action(:search, raise_exception: false)
+
           # Filter out the models without a search_query
           next if resource.search_query.nil?
 
@@ -120,10 +121,16 @@ module Avo
       models.map do |model|
         resource = avo_resource.dup.hydrate(model: model).hydrate_fields(model: model)
 
+        record_path = if resource.search_result_path.present?
+          Avo::Hosts::ResourceRecordHost.new(block: resource.search_result_path, resource: resource, record: model).handle
+        else
+          resource.record_path
+        end
+
         result = {
           _id: model.id,
           _label: resource.label,
-          _url: resource.record_path,
+          _url: record_path
         }
 
         if App.license.has_with_trial(:enhanced_search_results)

data/app/helpers/avo/application_helper.rb

@@ -102,16 +102,15 @@ module Avo
     end
 
     def root_path_without_url
-      Avo::App.root_path
-        .to_s
-        .delete_prefix(request.base_url.to_s)
-        .delete_suffix("/")
-        .gsub("/?", "?")
-        .query = ""
+      "#{Avo.configuration.prefix_path}#{mount_path}"
     rescue
       Avo.configuration.root_path
     end
 
+    def mount_path
+      Avo::Engine.routes.find_script_name(params.permit!.to_h.symbolize_keys)
+    end
+
     private
 
     # Taken from the original library

data/config/master.key

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

data/lib/avo/base_resource.rb

@@ -30,6 +30,7 @@ module Avo
     class_attribute :description, default: :id
     class_attribute :search_query, default: nil
     class_attribute :search_query_help, default: ""
+    class_attribute :search_result_path
     class_attribute :includes, default: []
     class_attribute :authorization_policy
     class_attribute :translation_key

data/lib/avo/configuration.rb

@@ -42,6 +42,7 @@ module Avo
     attr_accessor :field_wrapper_layout
     attr_accessor :sign_out_path_name
     attr_accessor :resources
+    attr_accessor :prefix_path
     attr_writer :branding
 
     def initialize
@@ -94,6 +95,7 @@ module Avo
       @authorization_client = :pundit
       @field_wrapper_layout = :inline
       @resources = nil
+      @prefix_path = nil
     end
 
     def current_user_method(&block)
@@ -117,8 +119,8 @@ module Avo
     end
 
     def namespace
-      if computed_root_path.present?
-        computed_root_path.delete "/"
+      if Avo.configuration.root_path.present?
+        Avo.configuration.root_path.delete "/"
       else
         root_path.delete "/"
       end
@@ -130,10 +132,6 @@ module Avo
       @root_path
     end
 
-    def computed_root_path
-      Avo.configuration.root_path
-    end
-
     def feature_enabled?(feature)
       !@disabled_features.map(&:to_sym).include?(feature.to_sym)
     end

data/lib/avo/engine.rb

@@ -7,6 +7,8 @@ Gem.loaded_specs["avo"].dependencies.each do |d|
     require "action_view/railtie"
   when "activestorage"
     require "active_storage/engine"
+  when "actiontext"
+    require "action_text/engine"
   else
     require d.name
   end

data/lib/avo/fields/date_field.rb

@@ -20,13 +20,26 @@ module Avo
       def formatted_value
         return if value.blank?
 
-        value.iso8601
+        try_iso8601
       end
 
       def edit_formatted_value
-        return nil if value.nil?
+        formatted_value
+      end
+
+      private
 
-        value.iso8601
+      def try_iso8601
+        if value.respond_to?(:iso8601)
+          value.iso8601
+        elsif value.is_a?(String)
+          parsed = DateTime.parse(value.dup)
+          if parsed.present?
+            parsed
+          end
+        else
+          value
+        end
       end
     end
   end

data/lib/avo/hosts/base_host.rb

@@ -10,6 +10,8 @@ module Avo
       option :params, default: proc { Avo::App.params }
       option :view_context, default: proc { Avo::App.view_context }
       option :current_user, default: proc { Avo::App.current_user }
+      option :main_app, default: proc { view_context.main_app }
+      option :avo, default: proc { view_context.avo }
       # This is optional because we might instantiate the `Host` first and later hydrate it with a block.
       option :block, optional: true
 

data/lib/avo/services/authorization_service.rb

@@ -130,8 +130,16 @@ module Avo
       end
 
       def has_method?(method, **args)
+        method = "#{method}?" unless method.to_s.end_with? "?"
         defined_methods(args[:record] || record, **args).include? method.to_sym
       end
+
+      # Check the received method to see if the user overrode it in their config and then checks if it's present on the policy.
+      def has_action_method?(method, **args)
+        method = Avo.configuration.authorization_methods.stringify_keys[method.to_s] || method
+
+        has_method? method, **args
+      end
     end
   end
 end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.28.0" unless const_defined?(:VERSION)
+  VERSION = "2.28.2.pre.pr1642" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/resource_generator.rb

@@ -87,12 +87,20 @@ module Generators
         end
       end
 
+      def rich_texts
+        @rich_texts ||= reflections.select do |_, reflection|
+          reflection.options[:class_name] == "ActionText::RichText"
+        end
+      end
+
       def tags
         @tags ||= reflections.select { |_, reflection| reflection.options[:as] == :taggable }
       end
 
       def associations
-        @associations ||= reflections.reject { |key| attachments.key?(key) || tags.key?(key) }
+        @associations ||= reflections.reject do |key|
+          attachments.key?(key) || tags.key?(key) || rich_texts.key?(key)
+        end
       end
 
       def fields
@@ -115,6 +123,7 @@ module Generators
         fields_from_model_enums
         fields_from_model_attachements
         fields_from_model_associations
+        fields_from_model_rich_texts
         fields_from_model_tags
 
         generated_fields_template
@@ -149,6 +158,12 @@ module Generators
         generated_fields_template
       end
 
+      def fields_from_model_rich_texts
+        rich_texts.each do |name, _|
+          fields[(name.delete_prefix("rich_text_"))] = {field: "trix"}
+        end
+      end
+
       def fields_from_model_tags
         tags.each do |name, _|
           fields[(remove_last_word_from name).pluralize] = {field: "tags"}

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

@@ -2,6 +2,8 @@
 Avo.configure do |config|
   ## == Routing ==
   config.root_path = '/<%= options[:path] %>'
+  # used only when you have custom `map` configuration in your config.ru
+  # config.prefix_path = "/internal"
 
   # Where should the user be redirected when visting the `/<%= options[:path] %>` url
   # config.home_path = nil
@@ -29,6 +31,7 @@ Avo.configure do |config|
   #   update: 'update?',
   #   create: 'create?',
   #   destroy: 'destroy?',
+  #   search: 'search?',
   # }
   # config.raise_error_on_missing_policy = false
   # config.authorization_client = :pundit
@@ -61,7 +64,6 @@ Avo.configure do |config|
   # config.view_component_path = "app/components"
   # config.display_license_request_timeout_error = true
   # config.disabled_features = []
-  # config.resource_controls = :right
   # config.tabs_style = :tabs # can be :tabs or :pills
   # config.buttons_on_form_footers = true
   # config.field_wrapper_layout = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.28.0
+  version: 2.28.2.pre.pr1642
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1696,6 +1696,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
@@ -1956,9 +1957,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: