avo 2.28.3.pre.pr1646 → 2.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527b4a8adeef6e5f6833c8329a66e2c5ced407a38f78956c4927f42af9967e93
-  data.tar.gz: e90ddb57665013a527f4cf1fe815578e3126af4b1225f96687b37386131cb9c5
+  metadata.gz: 572070da39670d32588de6616a4b51015615efe3482ea813fe148035bba33cf7
+  data.tar.gz: 9a1056b36ab1d3ceebd06eeb505fb5641f41d9ddbe943e48e87627030df2edb0
 SHA512:
-  metadata.gz: ab734f7daa2221975ef03005c5b7a94e75db330055de4e90efc540d91e2d9816ee3c89013f13b7d195010df224569849f449e3460010991ed1ec59c1a5bdabb6
-  data.tar.gz: a6b2a63cfdba2692203888b799c4e3c12414ece3cfc5017ce26a2dc453477c7e0f3d3065780add4232af92343915e3a8d98faa65f9ae07b4b5ab45d40d74360a
+  metadata.gz: 95570888ee4d613f5062f3cf924aa7af69d1b6675a042da4a0ed75131a5e858ab451ab4d23c85ceed79c1a8f57508ef2dda4540cdbc7462f96ff251e1f70a20c
+  data.tar.gz: 3941183c0d08772696b52fdc5bac795d35002d87309dd7d5963d1f9b4d7b1107354ba3cf0d116a8752af35ec54a39e0f89de4c05df2e67df28aaa1b062aa1f39

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.28.3.pre.pr1646)
+    avo (2.29.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

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/app/javascript/js/controllers/fields/tags_field_controller.js

@@ -60,6 +60,10 @@ export default class extends BaseController {
         },
         originalInputValueFormat: (valuesArr) => valuesArr.map((item) => item.value),
       })
+    } else {
+      options = merge(options, {
+        originalInputValueFormat: (valuesArr) => valuesArr.map((item) => item.value).join(','),
+      })
     }
 
     return options

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/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.28.3.pre.pr1646" unless const_defined?(:VERSION)
+  VERSION = "2.29.0" unless const_defined?(:VERSION)
 end

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