avo 1.13.1 → 1.15.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0baf47fd7f3da2f36db120c0e1fdc4063a50dbc3262ee30a474c05c5ebe8739
-  data.tar.gz: 2a5beff3b34dc9fed0cfe4b069b573113b5bf941afa5e215e9697c68cd9d1b8f
+  metadata.gz: d383ac646109d2df17ad55051991565b86751396b90f07bed6febd2c74ec2a3b
+  data.tar.gz: 165d98536e64218b88b4cd4e3191cabf1ccda0469d3bd85d84d1498097c1404f
 SHA512:
-  metadata.gz: eee0521a8274435919a3fbc636d06611b60c0d3f741842cf4e1f5c91d0455f38e46c5752c810945650a9d3aac544e459c80f46b7c318b828ec686c3192fed185
-  data.tar.gz: 6a3d4b79ae988be2b8f162547a21324fdd96ee9a53a5c1dcd1220d78d25c554fa19d0dc402e162737f86d0a0075b7252f862e9c21ebc0e4be0e3ac7a582c70a2
+  metadata.gz: d3981465a470c93bef51cea94d4fe2b1cd3473e0e07bcbd5e7bdd2dcc7749d14ad9560fe2b46794e8e41a4554725cefaab61b68908ede56d3f6cf1bda54d42b7
+  data.tar.gz: c96ee899de497fa540760abab565bbca84b4d40b074159e73403661604fefffa3bca342bbf8407c07a27bbaad0c95d3c2cf5f1dccd4f72376b3ce73a508d7c5f

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.1)
+    avo (1.15.0.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -201,15 +201,15 @@ 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)
+    nio4r (2.5.8)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.11.7-x86_64-linux)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (4.11.0)
@@ -218,7 +218,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 +417,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

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/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/search_controller.js

@@ -105,7 +105,10 @@ export default class extends Controller {
 
     autocomplete({
       container: this.autocompleteTarget,
-      placeholder: 'Search',
+      placeholder: this.translationKeys.placeholder,
+      translations: {
+        detachedCancelButtonText: this.translationKeys.cancel_button,
+      },
       openOnFocus: true,
       detachedMediaQuery: '',
       getSources: ({ query }) => {

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

@@ -2,7 +2,7 @@
   <div class="inline-block"
     data-search-target="autocomplete"
     data-search-resource="global"
-    data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
+    data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>", "placeholder": "<%= I18n.translate 'avo.search.placeholder' %>", "cancel_button": "<%= I18n.translate 'avo.search.cancel_button' %>"}'
     data-debounce-timeout='<%= Avo.configuration.search_debounce %>'
   >
   </div>

data/app/views/avo/sidebar/_sidebar.html.erb

@@ -12,7 +12,7 @@
 
         <div class="w-full">
           <% Avo::App.resources_navigation(_current_user).each do |resource| %>
-            <%= render Avo::NavigationLinkComponent.new label: resource.name.pluralize.humanize, path: resources_path(resource.model_class) %>
+            <%= render Avo::NavigationLinkComponent.new label: resource.plural_name.humanize, path: resources_path(resource.model_class) %>
           <% end %>
 
           <% sidebar_partials = Avo::App.get_sidebar_partials %>

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

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.13.1"
+  VERSION = "1.15.0.pre.1"
 end

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -80,3 +80,6 @@ en:
         other: 'users'
     reset_filters: 'Reset filters'
     not_authorized: 'You are not authorized to perform this action.'
+    search:
+      placeholder: 'Search'
+      cancel_button: 'Cancel'

data/lib/generators/avo/templates/locales/avo.nb-NO.yml

@@ -78,3 +78,5 @@ nb-NO:
         other: 'brukere'
     reset_filters: 'Nullstill filter'
     not_authorized: 'Du er ikke autorisert til å gjøre denne handlingen.'
+    search_placeholder: 'Søk'
+    search_cancel_button: 'Avbryt'

data/lib/generators/avo/templates/locales/avo.pt-BR.yml

@@ -79,3 +79,6 @@ pt-BR:
         other: 'usuários'
     reset_filters: 'Limpar filtros'
     not_authorized: 'Você não está autorizado à executar essa ação.'
+    search:
+      placeholder: 'Procurar'
+      cancel_button: 'Cancelar'

data/lib/generators/avo/templates/locales/avo.ro.yml

@@ -67,3 +67,6 @@ ro:
         zero: 'utilizatori'
         one: 'utilizator'
         other: 'utilizatori'
+    search:
+      placeholder: 'Cauta'
+      cancel_button: 'Anulare'