avo 1.13.3 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f8f8a16bb27f36fe69f33aa950e7250aed0faf2f7ca7aa9e9e77058ddc95ea9
-  data.tar.gz: 90dceb9b36ca44a2be8382c9f285bbece7c34141280b7bb704341f1cd77a31bb
+  metadata.gz: '058d74773e0381fcecf783cd8bebcb40324f6c2bab9de93c17d0f75b245319ba'
+  data.tar.gz: 8d5eba16f6aa0f07cb7215df8ef4b9e2c75bfc87cbdb64f24b5376d5068834a0
 SHA512:
-  metadata.gz: bc1ee697399f753ff66d1a6f4d08bb2561d1ba6daf4d25557cd6d504fdd6bb66d30c68557f5dce79d4f5463f18fb54b449bd7fc111fbddfcce0850b2ad8fc61f
-  data.tar.gz: a82b35d6f342e7edbaf1ec51ad67133bb33c64b4f641eefb433b00d68145545eb73ba3bd8241f9670ae395017deecc2aff19023fd2040a9f0a2183e3c7f00210
+  metadata.gz: 3619d803b275d81b9d67f6adcf8d8ad4025325f39f64d2c9f421c556879045e188a484d1596e033f28bede52857793ea4004ff4a32f3e3000c78af446acb8b6f
+  data.tar.gz: ec928e6cb7d34e001c269cefaf60c8172526249420deb4dac14266108d2d847f36bf2bf3ba4d0a53f6f978063dd76e0695eb568827719ba40d5a79319a2543dd

data/Gemfile

@@ -30,7 +30,7 @@ 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
-gem "puma", "~> 5.3.1"
+gem "puma", "~> 5.5.1"
 # Use SCSS for stylesheets
 gem "sass-rails", ">= 6"
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.13.3)
+    avo (1.16.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -201,15 +201,13 @@ GEM
     mime-types-data (3.2021.0225)
     mini_magick (4.11.0)
     mini_mime (1.0.3)
-    mini_portile2 (2.5.3)
+    mini_portile2 (2.6.1)
     minitest (5.14.4)
     msgpack (1.4.2)
     multi_xml (0.6.0)
-    nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
-      racc (~> 1.4)
-    nokogiri (1.11.7-x86_64-linux)
+    nio4r (2.5.8)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (4.11.0)
@@ -218,7 +216,7 @@ GEM
       ast (~> 2.4.1)
     pg (1.2.3)
     public_suffix (4.0.6)
-    puma (5.3.1)
+    puma (5.5.1)
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
@@ -417,7 +415,7 @@ DEPENDENCIES
   manifester
   meta-tags
   pg (>= 0.18, < 2.0)
-  puma (~> 5.3.1)
+  puma (~> 5.5.1)
   pundit
   rails (~> 6.1.0)
   rails-controller-testing
@@ -441,4 +439,4 @@ DEPENDENCIES
   zeitwerk (~> 2.3)
 
 BUNDLED WITH
-   2.2.17
+   2.2.29

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

@@ -14,13 +14,20 @@
     <% end %>
 
     <div class="flex justify-between lg:flex-col lg:space-y-2 2xl:flex-row 2xl:space-y-0">
-      <%= 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::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 %>
+      <div>
+        <% if @resource.authorization.authorize_action(:download_attachments?, raise_exception: false) %>
+          <%= 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 %>
+        <% end %>
+      </div>
+      <div>
+        <% if @resource.authorization.authorize_action(:delete_attachments?, raise_exception: false) %>
+          <%= 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 %>
+        <% end %>
+      </div>
     </div>
   <% end %>
 </div>

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

@@ -14,13 +14,21 @@
     <% end %>
 
     <div class="flex justify-between">
-      <%= 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::App.root_path}/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id
-      }/active_storage_attachments/#{@id}/#{@file.blob_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 %>
+      <div>
+        <% if @resource.authorization.authorize_action(:download_attachments?, raise_exception: false) %>
+          <%= a_link helpers.main_app.url_for(@file), color: 'indigo', download: true, class: '', size: :md do %>
+            <%= helpers.svg 'download' %> <%= t('avo.download_file') %>
+          <% end %>
+        <% end %>
+      </div>
+      <div>
+        <% if @resource.authorization.authorize_action(:delete_attachments?, raise_exception: false) %>
+          <%= a_link "#{Avo::App.root_path}/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id
+          }/active_storage_attachments/#{@id}/#{@file.blob_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 %>
+        <% end %>
+      </div>
     </div>
   <% else %>
     –

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

@@ -5,5 +5,7 @@
     </div>
   <% end %>
 
-  <%= @form.file_field @field.id, disabled: @field.readonly %>
+  <% if @resource.authorization.authorize_action(:upload_attachments?, raise_exception: false) %>
+    <%= @form.file_field @field.id, disabled: @field.readonly %>
+  <% end %>
 <% end %>

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

@@ -1,5 +1,7 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, full_width: true do %>
   <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 
-  <%= @form.file_field @field.id, disabled: @field.readonly, multiple: true %>
+  <% if @resource.authorization.authorize_action(:upload_attachments?, raise_exception: false) %>
+    <%= @form.file_field @field.id, disabled: @field.readonly, multiple: true %>
+  <% end %>
 <% end %>

data/app/components/avo/index/resource_controls_component.rb

@@ -24,7 +24,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
 
   def show_path
     if @parent_model.present?
-      helpers.resource_path(@resource.model, via_resource_class: @parent_model.class, via_resource_id: @parent_model.id)
+      helpers.resource_path(@resource.model, via_resource_class: @parent_model.class.base_class, via_resource_id: @parent_model.id)
     else
       helpers.resource_path(@resource.model)
     end
@@ -32,7 +32,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
 
   def edit_path
     if @parent_model.present?
-      helpers.edit_resource_path(@resource.model, via_resource_class: @parent_model.class, via_resource_id: @parent_model.id)
+      helpers.edit_resource_path(@resource.model, via_resource_class: @parent_model.class.base_class, via_resource_id: @parent_model.id)
     else
       helpers.edit_resource_path(@resource.model)
     end

data/app/controllers/avo/application_controller.rb

@@ -97,9 +97,9 @@ module Avo
     end
 
     def resource_path(model = nil, resource_id: nil, keep_query_params: false, **args)
-      return avo.send :"resources_#{model.model_name.route_key.singularize}_path", resource_id, **args if resource_id.present?
+      return avo.send :"resources_#{singular_name(model)}_path", resource_id, **args if resource_id.present?
 
-      avo.send :"resources_#{model.model_name.route_key.singularize}_path", model, **args
+      avo.send :"resources_#{singular_name(model)}_path", model, **args
     end
 
     def resource_attach_path(model_name, model_id, related_name, related_id = nil)
@@ -119,11 +119,11 @@ module Avo
     end
 
     def new_resource_path(model, **args)
-      avo.send :"new_resources_#{model.model_name.route_key.singularize}_path", **args
+      avo.send :"new_resources_#{singular_name(model)}_path", **args
     end
 
     def edit_resource_path(model, **args)
-      avo.send :"edit_resources_#{model.model_name.route_key.singularize}_path", model, **args
+      avo.send :"edit_resources_#{singular_name(model)}_path", model.id, **args
     end
 
     private
@@ -283,5 +283,23 @@ module Avo
     def on_api_path
       request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
     end
+
+    def get_model_class(model)
+      if model.instance_of?(Class)
+        model
+      else
+        model.class
+      end
+    end
+
+    def singular_name(model_or_class)
+      model_class = get_model_class model_or_class
+
+      if ActiveModel::Naming.uncountable? model_class
+        model_class.model_name.route_key.singularize.gsub('_index', '')
+      else
+        model_class.model_name.route_key.singularize
+      end
+    end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -161,7 +161,7 @@ module Avo
     private
 
     def model_route_key
-      @resource.model_class.model_name.route_key.singularize
+      singular_name @resource.model_class
     end
 
     def model_params

data/app/packs/js/controllers/text_filter_controller.js

@@ -0,0 +1,23 @@
+import BaseFilterController from './filter_controller'
+
+export default class extends BaseFilterController {
+  static targets = ['text']
+
+  getFilterValue() {
+    return this.textTarget.value
+  }
+
+  tryToSubmit(e) {
+    if (e.keyCode === 13) {
+      return this.changeFilter()
+    }
+
+    return undefined
+  }
+
+  getFilterClass() {
+    const { filterClass } = this.textTarget.dataset
+
+    return filterClass
+  }
+}

data/app/views/avo/base/_text_filter.html.erb

@@ -0,0 +1,23 @@
+<%
+  begin
+    decoded_filters_param = JSON.parse(Base64.decode64(params[:filters]))
+    set_value = decoded_filters_param[filter.class.to_s]
+  rescue => exception
+    set_value = filter.default
+  end
+%>
+<div data-controller="text-filter">
+  <%= filter_wrapper name: filter.name do %>
+    <%= text_field_tag filter.id, set_value,
+      class: input_classes('w-full mb-0'),
+      id: "avo_filters_#{filter.id.parameterize.underscore}",
+      'data-filter-class': filter.class.to_s,
+      'data-text-filter-target': 'text',
+      'data-action': 'keypress->text-filter#tryToSubmit'
+    %>
+    <div class="flex justify-end">
+      <%= a_button filter.button_label || "Filter by #{filter.name}", class: 'mt-4', color: 'blue', data: { action: "text-filter#changeFilter" }, size:   :sm %>
+    </div>
+    <%= link_to 'url_redirect', request.url, data: { 'text-filter-target': 'urlRedirect', 'turbo-frame': params[:turbo_frame] }, style: 'hidden', class: 'hidden' %>
+  <% end %>
+</div>

data/lib/avo/app.rb

@@ -169,6 +169,8 @@ module Avo
                 resource.to_s.underscore.gsub("_resource", "").downcase.pluralize.to_sym
               end
 
+              # Handle uncountable routes
+              route_key = route_key.to_sym
               resources route_key
             end
         end

data/lib/avo/fields_collector.rb

@@ -40,6 +40,7 @@ module Avo
     end
 
     def heading(body, **args)
+      self.fields ||= []
       self.fields << Avo::Fields::HeadingField.new(body, **args)
     end
 

data/lib/avo/filters/text_filter.rb

@@ -0,0 +1,9 @@
+module Avo
+  module Filters
+    class TextFilter < BaseFilter
+      class_attribute :button_label
+
+      self.template = "avo/base/text_filter"
+    end
+  end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.13.3"
+  VERSION = "1.16.0"
 end