avo 1.15.0.pre.1 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d383ac646109d2df17ad55051991565b86751396b90f07bed6febd2c74ec2a3b
-  data.tar.gz: 165d98536e64218b88b4cd4e3191cabf1ccda0469d3bd85d84d1498097c1404f
+  metadata.gz: 391b29088645004eb4d4f3c2f6bc01ab86695aaf85f4d076004b08730ab2f8ff
+  data.tar.gz: d062bfc791119e31a8c3868cfe2842b3835a4bfc52668a6252e5f7c85fe064e0
 SHA512:
-  metadata.gz: d3981465a470c93bef51cea94d4fe2b1cd3473e0e07bcbd5e7bdd2dcc7749d14ad9560fe2b46794e8e41a4554725cefaab61b68908ede56d3f6cf1bda54d42b7
-  data.tar.gz: c96ee899de497fa540760abab565bbca84b4d40b074159e73403661604fefffa3bca342bbf8407c07a27bbaad0c95d3c2cf5f1dccd4f72376b3ce73a508d7c5f
+  metadata.gz: e8c30ba4c563d73564be81cdc2391f0a1f88cb435aff55ba1e01ac196c835d9e77ffbf265a7ef1a9721dc91569dbb5744af3d3c72688ebf2e5453b12b4edf644
+  data.tar.gz: 1525ced018fb96312cd7317e424124e31021dbf37b42c505aecce07ac151a1a27a932fdc9553ceb882ba434db877fa3f2f3dd0f6dd6ca92094304eee986649bc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.15.0.pre.1)
+    avo (1.16.2)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -209,8 +209,6 @@ GEM
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
-      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (4.11.0)
     parallel (1.20.1)
@@ -441,4 +439,4 @@ DEPENDENCIES
   zeitwerk (~> 2.3)
 
 BUNDLED WITH
-   2.2.17
+   2.2.29

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/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/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/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.pre.1"
+  VERSION = "1.16.2"
 end