avo 1.15.0 → 1.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce1c9ffa6fde59af4b61d77ff981b439a369323c9d50c7775e8c505e23a48b4f
-  data.tar.gz: 3f56bed982b298e60c4ea007f9946584810d9d5c1a6ab304a670dfd12f7312c2
+  metadata.gz: 24fb847d8c6ebd7ba3c45926bc5431d7d100b3baf56391e316d4f30cebbae4f7
+  data.tar.gz: 7eb97752916fd9159f0210e5f500a9b4c563c9d250ffa53b59dd1ad54b5ff770
 SHA512:
-  metadata.gz: 56131c0af786bab270cc590048c25587efbc31d0614e8faafc10ea4fac9c6c5c0e5155b23f978a4bd8da7c4faf3c30befc87585ca8c2b61873d135ef28c6515d
-  data.tar.gz: 504322330fb7d8b75e860614c00c5c3c8972476f7475b01bd4a0a2b0fa1589682138156666b97ecf950dbfddf33a9f47349cfafa74b9afe72f93141c16e032b8
+  metadata.gz: 99780816253684b5de953532a0da805fecf38ab55115475438d94553ebe24989912e45172f7028d4c468482427f3da1686ea78d5c698ad3f24ff771fc0be72dc
+  data.tar.gz: 54104ca33a97fb1508133b6f1db18772cf94db9404d2c4dde5b507bc64b2c80fba54c00501bad998f6998a83f533902c18dd6425b541c451c9d55c917b11699f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.15.0)
+    avo (1.16.3)
       active_link_to
       addressable
       breadcrumbs_on_rails

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

@@ -14,6 +14,11 @@
                 <%= svg 'trash' %> <%= t('avo.detach_item', item: @reflection.name.to_s).capitalize %>
               <% end %>
             <% end %>
+            <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
+              <%= a_link edit_path, color: 'indigo' do %>
+                <%= svg 'edit' %> <%= t('avo.edit').capitalize %>
+              <% end %>
+            <% end %>
           <% else %>
             <%= a_link back_path do %>
               <%= svg 'arrow-left' %> <%= t('avo.go_back') %>

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/app/views/avo/partials/_profile_dropdown.html.erb

@@ -17,7 +17,7 @@
 
   <% if main_app.respond_to?(:destroy_user_session_path) %>
     <div class="hidden absolute inset-auto inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
-      <%= button_to "Sign out", main_app.destroy_user_session_path, method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
+      <%= button_to t('avo.sign_out'), main_app.destroy_user_session_path, method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
     </div>
   <% end %>
 </div>

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

@@ -11,8 +11,8 @@
         <%= render Avo::NavigationHeadingComponent.new label: t('avo.resources') %>
 
         <div class="w-full">
-          <% Avo::App.resources_navigation(_current_user).each do |resource| %>
-            <%= render Avo::NavigationLinkComponent.new label: resource.plural_name.humanize, path: resources_path(resource.model_class) %>
+          <% Avo::App.resources_navigation(_current_user).sort_by { |r| r.navigation_label }.each do |resource| %>
+            <%= render Avo::NavigationLinkComponent.new label: resource.navigation_label, path: resources_path(resource.model_class) %>
           <% end %>
 
           <% sidebar_partials = Avo::App.get_sidebar_partials %>

data/lib/avo/app.rb

@@ -164,13 +164,11 @@ module Avo
             end
             .map do |resource|
               route_key = if resource.model_class.present?
-                resource.model_class.model_name.route_key
+                resource.model_class.model_name.plural.to_sym
               else
                 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/base_resource.rb

@@ -230,6 +230,10 @@ module Avo
       self.class.name.demodulize.underscore
     end
 
+    def navigation_label
+      plural_name.humanize
+    end
+
     def available_view_types
       view_types = [:table]
 

data/lib/avo/fields/base_field.rb

@@ -85,7 +85,7 @@ module Avo
 
       def visible?
         if visible.present? && visible.respond_to?(:call)
-          visible.call resource: resource
+          visible.call resource: @resource
         else
           visible
         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.15.0"
+  VERSION = "1.16.3"
 end

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

@@ -83,3 +83,4 @@ en:
     search:
       placeholder: 'Search'
       cancel_button: 'Cancel'
+    sign_out: 'Sign out'

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

@@ -80,3 +80,4 @@ nb-NO:
     not_authorized: 'Du er ikke autorisert til å gjøre denne handlingen.'
     search_placeholder: 'Søk'
     search_cancel_button: 'Avbryt'
+    sign_out: 'Logg ut'

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

@@ -82,3 +82,4 @@ pt-BR:
     search:
       placeholder: 'Procurar'
       cancel_button: 'Cancelar'
+    sign_out: 'sair'

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

@@ -70,3 +70,4 @@ ro:
     search:
       placeholder: 'Cauta'
       cancel_button: 'Anulare'
+    sign_out: 'Delogare'