avo 1.19.1.pre.10 → 1.19.1.pre.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1618da266ed143055270d6efe40cbc1672b074977668186ba979dd062e28c296
-  data.tar.gz: 03600d5cf52bc8cba85970ce6f7c7dceeba01747c17fff374a22ed4137048fc1
+  metadata.gz: d5138e11c8508c204270f3b71100905e2046cddba58dc4328459b6f230918b10
+  data.tar.gz: 5b63ee835184e1e6b49f4fe6685eb3da91d435a88304917a20c187e88ce8c377
 SHA512:
-  metadata.gz: 80856cc4b3c4e164570d5209140e09bfb617c90db0500652b577500a3ed675a96ec14b4944b5e4339849820860fe9f100a971fe414205352e8a37a7983b51bae
-  data.tar.gz: 3bc19b1c7feb5e06e485648c8ea30f46ddce97ff591c71c69ca0bfef7ac73b384001d202022f5004437a1cffa2c17ec94167160c5136c8e99d977e02df5ef601
+  metadata.gz: 8fcb3d6de28e6582d29c80f58d618a4c00676ea9cbd2e9120c6affd3bf3ebe0816ffcb01fdd692584813f928e0977615304cd0768d3c2f88cf72cd54ef4e0101
+  data.tar.gz: 8349c52ce5985fdb37c64c7a39a9ecff8b0b7b1985a90904c181655d2a3f01095e2cc66f69e5a0c5e7facc74f9ccc8ecd64d5b1bc010c055f34db5a8bbd014d8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.19.1.pre.10)
+    avo (1.19.1.pre.11)
       active_link_to
       addressable
       breadcrumbs_on_rails

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

@@ -1,7 +1,10 @@
 <div data-model-id="<%= @resource.model.id %>">
-<%= @resource.form_scope %>
   <% @resource.panels.each do |resource_panel| %>
-    <%= form_with model: @resource.model, scope: @resource.form_scope, url: helpers.resource_path(model: @resource.model, resource: @resource), method: :put, multipart: true do |form| %>
+    <%= form_with model: @resource.model,
+                  scope: @resource.form_scope,
+                  url: helpers.resource_path(model: @resource.model, resource: @resource),
+                  method: :put,
+                  multipart: true do |form| %>
       <%= hidden_field_tag :referrer, back_path if params[:via_resource_class] %>
 
       <%= render Avo::PanelComponent.new(title: resource_panel[:name], description: @resource.resource_description, display_breadcrumbs: true) do |c| %>

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

@@ -1,8 +1,8 @@
 <div>
-  <%= render Avo::PanelComponent.new(title: title, description: @resource.resource_description, body_classes: 'py-4', data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
+  <%= render Avo::PanelComponent.new(title: title, description: description, body_classes: 'py-4', data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
     <% c.tools do %>
       <% if can_see_the_actions_button? %>
-        <%= render 'actions' if @actions.present? %>
+        <%= render 'actions' %>
       <% end %>
 
       <% if can_see_the_create_button? %>

data/app/components/avo/views/resource_index_component.rb

@@ -55,6 +55,8 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def can_see_the_actions_button?
+    return false if @actions.blank?
+
     return authorize_association_for("act_on") if @reflection.present?
 
     @resource.authorization.authorize_action(:act_on, raise_exception: false) && !has_reflection_and_is_read_only
@@ -123,6 +125,12 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     end
   end
 
+  def description
+    return if @reflection.present?
+
+    @resource.resource_description
+  end
+
   private
 
   def reflection_model_class

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

@@ -1,6 +1,13 @@
 <div>
   <% @resource.panels.each do |resource_panel| %>
-    <%= form_with model: @resource.model, scope: @resource.form_scope, url: helpers.resources_path(resource: @resource, via_relation_class: params[:via_relation_class], via_relation: params[:via_relation], via_resource_id: params[:via_resource_id]), local: true, multipart: true do |form| %>
+    <%= form_with model: @resource.model,
+                  scope: @resource.form_scope,
+                  url: helpers.resources_path(resource: @resource,
+                                              via_relation_class: params[:via_relation_class],
+                                              via_relation: params[:via_relation],
+                                              via_resource_id: params[:via_resource_id]),
+                  local: true,
+                  multipart: true do |form| %>
       <%= render Avo::PanelComponent.new(title: resource_panel[:name], description: @resource.resource_description, display_breadcrumbs: true) do |c| %>
         <% c.tools do %>
           <div class="flex justify-end space-x-2">

data/app/controllers/avo/application_controller.rb

@@ -111,7 +111,6 @@ module Avo
     end
 
     def fill_model
-      puts ['@model_to_fill->', @model_to_fill].inspect
       @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
     end
 

data/app/controllers/avo/base_controller.rb

@@ -198,7 +198,6 @@ module Avo
 
       request_params = params.require(model_param_key).permit(permitted_params)
 
-      puts ['model_param_key->', model_param_key, params, request_params].inspect
       if @resource.devise_password_optional && request_params[:password].blank? && request_params[:password_confirmation].blank?
         request_params.delete(:password_confirmation)
         request_params.delete(:password)

data/db/factories.rb

@@ -53,4 +53,12 @@ FactoryBot.define do
     name { "#{Faker::Name.first_name} #{Faker::Name.last_name}" }
     type { "Spouse" }
   end
+
+  factory :course do
+    name { Faker::Company.name }
+  end
+
+  factory :link do
+    name { Faker::Internet.url }
+  end
 end

data/lib/avo/fields/key_value_field.rb

@@ -3,10 +3,6 @@ require "json"
 module Avo
   module Fields
     class KeyValueField < BaseField
-      attr_reader :key_label
-      attr_reader :value_label
-      attr_reader :action_text
-      attr_reader :delete_text
       attr_reader :disable_editing_keys
       attr_reader :disable_adding_rows
 
@@ -15,10 +11,10 @@ module Avo
 
         hide_on :index
 
-        @key_label = args[:key_label].present? ? args[:key_label].to_s : I18n.translate('avo.key_value_field.key')
-        @value_label = args[:value_label].present? ? args[:value_label].to_s : I18n.translate('avo.key_value_field.value')
-        @action_text = args[:action_text].present? ? args[:action_text].to_s : I18n.translate('avo.key_value_field.add_row')
-        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : I18n.translate('avo.key_value_field.delete_row')
+        @key_label = args[:key_label].to_s if args[:key_label].present?
+        @value_label = args[:value_label].to_s if args[:value_label].present?
+        @action_text = args[:action_text].to_s if args[:action_text].present?
+        @delete_text = args[:delete_text].to_s if args[:delete_text].present?
 
         @disable_editing_keys = args[:disable_editing_keys].present? ? args[:disable_editing_keys] : false
         # disabling editing keys also disables adding rows (doesn't take into account the value of disable_adding_rows)
@@ -32,6 +28,30 @@ module Avo
         @disable_deleting_rows = args[:disable_deleting_rows].present? ? args[:disable_deleting_rows] : false
       end
 
+      def key_label
+        return @key_label if @key_label && !@key_label.empty?
+
+        I18n.translate('avo.key_value_field.key')
+      end
+
+      def value_label
+        return @value_label if @value_label && !@value_label.empty?
+
+        I18n.translate('avo.key_value_field.value')
+      end
+
+      def action_text
+        return @action_text if @action_text && !@action_text.empty?
+
+        I18n.translate('avo.key_value_field.add_row')
+      end
+
+      def delete_text
+        return @delete_text if @delete_text && !@delete_text.empty?
+
+        I18n.translate('avo.key_value_field.delete_row')
+      end
+
       def to_permitted_param
         [:"#{id}", "#{id}": {}]
       end

data/lib/avo/services/authorization_service.rb

@@ -68,6 +68,9 @@ module Avo
         def authorize_action(user, record, action, **args)
           action = Avo.configuration.authorization_methods.stringify_keys[action.to_s] || action
 
+          # Add the question mark if it's missing
+          action = "#{action}?" unless action.end_with? '?'
+
           return true if action.nil?
 
           authorize user, record, action, **args

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.19.1.pre.10"
+  VERSION = "1.19.1.pre.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 1.19.1.pre.10
+  version: 1.19.1.pre.11
 platform: ruby
 authors:
 - Adrian Marin