avo 2.10.2 → 2.10.3.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fcc28841e21f49a9ad7146589f8e280f352d160106bc67539630a819a2fea14
-  data.tar.gz: 7d0049458872fa7a81003d1358673b65ff29d38256b6d2d20c8fdaf757b09d8f
+  metadata.gz: eaf0eb69447308c9c5124d557cacfcc5fce7ad1ee307980ea1601671e861346b
+  data.tar.gz: 1e1b14789776d3d3382fca548f8ab1f18d05996ce39fce98091a75723e3b9dd0
 SHA512:
-  metadata.gz: aa278bfe2a28f7f441239455246af82da628b9d699e7a583e6da65972305c75e407fce432341b11d21ec5225ff67c8558b6017bb75a1d42e7be42f3653e0d259
-  data.tar.gz: 8a6ff3c392ce98703272555aabe01ae005f8df10081c7a1bde90e5a7ef99063144d5d573b4012b31b44d0b0c585334ee69fabf5f4414d1e053c2abaa61fe6ae6
+  metadata.gz: 7c42723dfef266320c8b26820c3e9d4670b2c7ce1dccfc49f808cd035d751711479753bb441d15e7b62190b3550d9ea8d435dfe47289c0a8aaa431de37127bc4
+  data.tar.gz: 8ea62dec974fc99d1f75f4e38a168738be810e118d99526f3cc166b9a12c1c13a8cfa33310fa6af24be32a838cb4e7cbd6f42c10108b76956a2b268525210992

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.10.2)
+    avo (2.10.3.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -22,40 +22,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actioncable (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionmailbox (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      actionview (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionmailer (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.6)
-      actionview (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionpack (6.1.6.1)
+      actionview (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       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.4.6)
-      actionpack (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actiontext (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionview (6.1.6.1)
+      activesupport (= 6.1.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -65,22 +65,22 @@ GEM
       addressable
     active_median (0.3.3)
       activesupport (>= 5.2)
-    activejob (6.1.4.6)
-      activesupport (= 6.1.4.6)
+    activejob (6.1.6.1)
+      activesupport (= 6.1.6.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.6)
-      activesupport (= 6.1.4.6)
-    activerecord (6.1.4.6)
-      activemodel (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-    activestorage (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-      marcel (~> 1.0.0)
+    activemodel (6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activerecord (6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activestorage (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.6)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -201,7 +201,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.10.0)
+    i18n (1.11.0)
       concurrent-ruby (~> 1.0)
     i18n_data (0.15.0)
       simple_po_parser (~> 1.1)
@@ -249,9 +249,11 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.6)
+    nokogiri (1.13.7)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    nokogiri (1.13.7-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
@@ -265,23 +267,23 @@ GEM
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     racc (1.6.0)
-    rack (2.2.3.1)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.4.6)
-      actioncable (= 6.1.4.6)
-      actionmailbox (= 6.1.4.6)
-      actionmailer (= 6.1.4.6)
-      actionpack (= 6.1.4.6)
-      actiontext (= 6.1.4.6)
-      actionview (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activemodel (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (6.1.6.1)
+      actioncable (= 6.1.6.1)
+      actionmailbox (= 6.1.6.1)
+      actionmailer (= 6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actiontext (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.6)
+      railties (= 6.1.6.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -292,11 +294,11 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    railties (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -370,7 +372,7 @@ GEM
     spring (4.0.0)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (4.0.2)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)

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

@@ -1,9 +1,15 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-  <%= @form.select @field.id, @field.select_options, { selected: @field.value, prompt: @field.placeholder },
+  <%= @form.select @field.id, @field.select_options, {
+      selected: @field.value,
+      include_blank: @field.include_blank
+    },
+    aria: {
+      placeholder: @field.placeholder
+    },
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: @field.readonly,
-    placeholder: @field.placeholder,
-    style: @field.get_html(:style, view: view, element: :input)
+    style: @field.get_html(:style, view: view, element: :input),
+    placeholder: @field.include_blank.present? ? nil : @field.placeholder
   %>
 <% end %>

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

@@ -1,14 +1,32 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-  <div data-controller="date-field">
-    <%= @form.date_field @field.id,
+  <%= content_tag :div, data: {
+      controller: "date-field",
+      date_field_view_value: @view,
+      date_field_enable_time_value: false,
+      date_field_format_value: @field.format,
+      date_field_picker_format_value: @field.picker_format,
+      date_field_first_day_of_week_value: @field.first_day_of_week,
+      date_field_disable_mobile_value: @field.disable_mobile,
+      date_field_relative_value: @field.relative,
+  } do %>
+    <%= datetime_field "fake_#{@field.id}", "fake",
+      value: @field.edit_formatted_value,
       class: classes("w-full"),
+      data: {
+        'date-field-target': 'fakeInput',
+        placeholder: @field.placeholder,
+        relative: @field.relative,
+        **@field.get_html(:data, view: view, element: :input)
+      },
+      disabled: @field.readonly,
+      placeholder: @field.placeholder,
+      style: @field.get_html(:style, view: view, element: :input)
+    %>
+    <%= @form.text_field @field.id,
+      value: @field.edit_formatted_value,
+      class: classes("w-full hidden"),
       data: {
         'date-field-target': 'input',
-        'first-day-of-week': @field.first_day_of_week,
-        'picker-format': @field.picker_format,
-        'disable-mobile': @field.disable_mobile,
-        'enable-time': false,
-        format: @field.format,
         placeholder: @field.placeholder,
         relative: @field.relative,
         **@field.get_html(:data, view: view, element: :input)
@@ -17,5 +35,5 @@
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>
-  </div>
+  <% end %>
 <% end %>

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

@@ -1,3 +1,9 @@
 <%= index_field_wrapper field: @field, resource: @resource do %>
-  <%= @field.formatted_value %>
+   <%= content_tag :div, data: {
+    controller: "date-field",
+    date_field_view_value: @view,
+    date_field_format_value: @field.format,
+  } do %>
+    <%= @field.formatted_value %>
+  <% end %>
 <% end %>

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

@@ -1,3 +1,9 @@
 <%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
-  <%= @field.formatted_value %>
+  <%= content_tag :div, data: {
+    controller: "date-field",
+    date_field_view_value: @view,
+    date_field_format_value: @field.format,
+  } do %>
+    <%= @field.formatted_value %>
+  <% end %>
 <% end %>

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

@@ -1,16 +1,32 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-  <div data-controller="date-field">
-    <%= @form.datetime_field @field.id,
+  <%= content_tag :div, data: {
+      controller: "date-field",
+      date_field_view_value: @view,
+      date_field_enable_time_value: true,
+      date_field_picker_format_value: @field.picker_format,
+      date_field_first_day_of_week_value: @field.first_day_of_week,
+      date_field_disable_mobile_value: @field.disable_mobile,
+      date_field_time24_hr_value: @field.time_24hr,
+      date_field_timezone_value: @field.timezone,
+  } do %>
+    <%= datetime_field "fake_#{@field.id}", "fake",
+      value: @field.edit_formatted_value,
       class: classes("w-full"),
+      data: {
+        'date-field-target': 'fakeInput',
+        placeholder: @field.placeholder,
+        relative: @field.relative,
+        **@field.get_html(:data, view: view, element: :input)
+      },
+      disabled: @field.readonly,
+      placeholder: @field.placeholder,
+      style: @field.get_html(:style, view: view, element: :input)
+    %>
+    <%= @form.text_field @field.id,
+      value: @field.edit_formatted_value,
+      class: classes("w-full hidden"),
       data: {
         'date-field-target': 'input',
-        'first-day-of-week': @field.first_day_of_week,
-        'picker-format': @field.picker_format,
-        'disable-mobile': @field.disable_mobile,
-        'enable-time': true,
-        time24hr: @field.time_24hr,
-        timezone: @field.timezone,
-        format: @field.format,
         placeholder: @field.placeholder,
         relative: @field.relative,
         **@field.get_html(:data, view: view, element: :input)
@@ -19,5 +35,5 @@
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>
-  </div>
+  <% end %>
 <% end %>

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

@@ -1,3 +1,11 @@
 <%= index_field_wrapper field: @field, resource: @resource do %>
-  <%= @field.formatted_value %>
+   <%= content_tag :div, data: {
+    controller: "date-field",
+    date_field_view_value: @view,
+    date_field_format_value: @field.format,
+    date_field_timezone_value: @field.timezone,
+    date_field_picker_format_value: @field.picker_format,
+  } do %>
+    <%= @field.formatted_value %>
+  <% end %>
 <% end %>

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

@@ -1,3 +1,11 @@
 <%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
-  <%= @field.formatted_value %>
+  <%= content_tag :div, data: {
+    controller: "date-field",
+    date_field_view_value: @view,
+    date_field_format_value: @field.format,
+    date_field_timezone_value: @field.timezone,
+    date_field_picker_format_value: @field.picker_format,
+  } do %>
+    <%= @field.formatted_value %>
+  <% end %>
 <% end %>

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

@@ -7,6 +7,7 @@
 
   <% if @resource.authorization.authorize_action(:upload_attachments?, raise_exception: false) %>
     <%= @form.file_field @field.id,
+      accept: @field.accept,
       data: @field.get_html(:data, view: view, element: :input),
       direct_upload: @field.direct_upload,
       disabled: @field.readonly,

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

@@ -4,6 +4,7 @@
   <% if @resource.authorization.authorize_action(:upload_attachments?, raise_exception: false) %>
     <div class="mt-2">
       <%= @form.file_field @field.id,
+        accept: @field.accept,
         data: @field.get_html(:data, view: view, element: :input),
         direct_upload: @field.direct_upload,
         disabled: @field.readonly,

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

@@ -1,12 +1,16 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-  <%= @form.select @field.id, @field.options_for_select, { selected: @field.value, prompt: @field.placeholder }, {
-      aria: {
-        placeholder: @field.placeholder
-      },
-      class: classes("w-full"),
-      data: @field.get_html(:data, view: view, element: :input),
-      disabled: @field.readonly,
-      style: @field.get_html(:style, view: view, element: :input),
-      value: @field.model.present? ? @field.model[@field.id] : @field.value
-    } %>
+  <%= @form.select @field.id, @field.options_for_select, {
+      selected: @field.value,
+      include_blank: @field.include_blank
+    },
+    aria: {
+      placeholder: @field.placeholder
+    },
+    class: classes("w-full"),
+    data: @field.get_html(:data, view: view, element: :input),
+    disabled: @field.readonly,
+    style: @field.get_html(:style, view: view, element: :input),
+    value: @field.model.present? ? @field.model[@field.id] : @field.value,
+    placeholder: @field.include_blank.present? ? nil : @field.placeholder
+  %>
 <% end %>

data/app/components/avo/index/ordering/button_component.rb

@@ -18,10 +18,6 @@ class Avo::Index::Ordering::ButtonComponent < Avo::Index::Ordering::BaseComponen
   end
 
   def order_path(args)
-    if reflection.present?
-      Avo::App.view_context.avo.associations_order_path(reflection_parent_resource.route_key, params[:id], field.id, resource.model.id, **args)
-    else
-      Avo::App.view_context.avo.resources_order_path(resource.route_key, resource.model.id, **args)
-    end
+    Avo::App.view_context.avo.reorder_order_path(resource.route_key, resource.model.id, **args)
   end
 end

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

@@ -34,7 +34,7 @@
       >
         <% if @resource.search_query.present? %>
           <div class="flex items-center px-4 w-64">
-            <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_name.collection} %>
+            <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key} %>
           </div>
         <% else %>
           <%# Offset for the space-y-2 property when the search is missing %>

data/app/controllers/avo/application_controller.rb

@@ -11,10 +11,11 @@ module Avo
     include Avo::UrlHelpers
 
     protect_from_forgery with: :exception
+    around_action :set_avo_locale
+    around_action :set_force_locale, if: -> { params[:force_locale].present? }
+    before_action :set_default_locale, if: -> { params[:set_locale].present? }
     before_action :init_app
     before_action :check_avo_license
-    before_action :set_default_locale
-    around_action :set_force_locale, if: -> { params[:force_locale].present? }
     before_action :set_authorization
     before_action :_authenticate!
     before_action :set_container_classes
@@ -288,18 +289,23 @@ module Avo
       @resource.form_scope
     end
 
+    # Sets the locale set in avo.rb initializer
+    def set_avo_locale(&action)
+      locale = Avo.configuration.locale || I18n.default_locale
+      I18n.with_locale(locale, &action)
+    end
+
+    # Enable the user to change the default locale with the `?set_locale=pt-BR` param
     def set_default_locale
-      I18n.locale = params[:set_locale] || I18n.default_locale
+      locale = params[:set_locale] || I18n.default_locale
 
-      I18n.default_locale = I18n.locale
+      I18n.default_locale = locale
     end
 
     # Temporary set the locale and reverting at the end of the request.
-    def set_force_locale
-      initial_locale = I18n.locale.to_s.dup
-      I18n.locale = params[:force_locale]
-      yield
-      I18n.locale = initial_locale
+    def set_force_locale(&action)
+      locale = params[:force_locale] || I18n.default_locale
+      I18n.with_locale(locale, &action)
     end
 
     def default_url_options

data/app/controllers/avo/base_controller.rb

@@ -154,7 +154,7 @@ module Avo
 
       respond_to do |format|
         if saved
-          format.html { redirect_to after_create_path, notice: "#{@model.class.name} #{t("avo.was_successfully_created")}." }
+          format.html { redirect_to after_create_path, notice: "#{@resource.name} #{t("avo.was_successfully_created")}." }
         else
           flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :new, status: :unprocessable_entity }
@@ -173,7 +173,7 @@ module Avo
 
       respond_to do |format|
         if saved
-          format.html { redirect_to after_update_path, notice: "#{@model.class.name} #{t("avo.was_successfully_updated")}." }
+          format.html { redirect_to after_update_path, notice: "#{@resource.name} #{t("avo.was_successfully_updated")}." }
         else
           flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :edit, status: :unprocessable_entity }
@@ -370,6 +370,8 @@ module Avo
     def set_edit_title_and_breadcrumbs
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
       @page_title = @resource.default_panel_name.to_s
+
+      last_crumb_args = {}
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_resource_id].present?
         via_resource = Avo::App.get_resource_by_model_name params[:via_resource_class]
@@ -378,11 +380,17 @@ module Avo
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: @resource)
         add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
+        puts ["via_resource.model_title->", via_resource.model_title].inspect
+
+        last_crumb_args = {
+          via_resource_class: params[:via_resource_class],
+          via_resource_id: params[:via_resource_id]
+        }
       else
         add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
       end
 
-      add_breadcrumb @resource.model_title, resource_path(model: @resource.model, resource: @resource)
+      add_breadcrumb @resource.model_title, resource_path(model: @resource.model, resource: @resource, **last_crumb_args)
       add_breadcrumb t("avo.edit").humanize
     end
 

data/app/controllers/avo/reorder_controller.rb

@@ -0,0 +1,25 @@
+require_dependency "avo/application_controller"
+
+module Avo
+  class ReorderController < ApplicationController
+    before_action :set_resource_name
+    before_action :set_resource
+    before_action :hydrate_resource
+    before_action :set_model
+
+    def order
+      direction = params[:direction].to_sym
+
+      if direction.present?
+        @resource
+          .hydrate(model: @model, params: params)
+          .ordering_host
+          .order direction
+      end
+
+      respond_to do |format|
+        format.html { redirect_to params[:referrer] || resources_path(resource: @resource) }
+      end
+    end
+  end
+end

data/app/helpers/avo/application_helper.rb

@@ -132,5 +132,11 @@ module Avo
         model.class
       end
     end
+
+    def root_path_without_url
+      Avo::App.root_path.to_s.delete_prefix(request.base_url.to_s).delete_suffix "/"
+    rescue
+      Avo.configuration.root_path
+    end
   end
 end

data/app/helpers/avo/url_helpers.rb

@@ -76,9 +76,5 @@ module Avo
 
       avo.resources_associations_index_path(parent_model.model_name.route_key, record.id, **existing_params, **args)
     end
-
-    def order_up_resource_path(model:, resource:, **args)
-      avo.send :"order_up_resources_#{resource.singular_route_key}_path", model, **args
-    end
   end
 end