avo 1.20.2.pre.1 → 1.21.1.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1637660ec39f73cf35fe0078d721b17ab5a2aded94fdbf633ce3b63c326c55a0
-  data.tar.gz: c990f246d271819abe2f098ecea83bb6b367cad93e6fc0cc0994d54c08e8dc64
+  metadata.gz: e78eb8560841b7427b02bd8ec702762d50211df5f1dc12e73ea2f002ffa26006
+  data.tar.gz: '08f1502ed0e5d5be5d93ab466317a789a978ce6a9c6220536e14776833984723'
 SHA512:
-  metadata.gz: 18fb3a1ee203bc93a1863e8138c3a7f7fac5faf4775e92fc7208fce652b1420e8efe9df28482ac30626b2095ebb4981aafaa9d8153fee6a1b5b09a0e30c8eb84
-  data.tar.gz: b74310670a84f49c7ba06847e018c9c41542f08376e95650126b74818aeb3fd73acf151647450ba69676e876e517a2a88986ae4d12b2336f027353f4841f7ba8
+  metadata.gz: '09e9d276e94cce4ce299cafe4d99767a27481b3fd375bef413b4a20c1701db4fa21bb483c4015ac1f18392620439aeb9d4369ca1706b880634b760b91ddbcc1c'
+  data.tar.gz: b935e3dfa5adc7e243989b95e0e8ada16ea7f22b643ee3892b3e9a8dcb9ea8e1ea4535af8871370a80e5df5d33571a24fb4ea01450e4821626a532410b28838e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.20.2.pre.1)
+    avo (1.21.1.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails

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

@@ -7,54 +7,54 @@
     [type.to_s, resource.model_key]
   end.to_h
 %>
-  <div data-controller="belongs-to-field"
+<div data-controller="belongs-to-field"
     data-searchable="<%= @field.searchable %>"
     data-association="<%= @field.id %>"
     data-association-class="<%= @field&.target_resource&.model_class || nil %>"
   >
-    <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-      <%= @form.select "#{@field.foreign_key}_type", @field.types.map { |type| [type.to_s.underscore.humanize, type.to_s] },
-        {
-          value: @field.value,
-          include_blank: @field.placeholder,
-        },
-        {
-          class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
-          disabled: disabled,
-          'data-belongs-to-field-target': "select",
-          'data-action': 'change->belongs-to-field#changeType'
-        }
-        %>
-      <%
+  <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+    <%= @form.select "#{@field.foreign_key}_type", @field.types.map { |type| [type.to_s.underscore.humanize, type.to_s] },
+      {
+        value: @field.value,
+        include_blank: @field.placeholder,
+      },
+      {
+        class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+        disabled: disabled,
+        'data-belongs-to-field-target': "select",
+        'data-action': 'change->belongs-to-field#changeType'
+      }
+    %>
+    <%
         # If the select field is disabled, no value will be sent. It's how HTML works.
         # Thus the extra hidden field to actually send the related id to the server.
         if disabled %>
-        <%= @form.hidden_field "#{@field.foreign_key}_type" %>
-      <% end %>
+      <%= @form.hidden_field "#{@field.foreign_key}_type" %>
     <% end %>
-    <% @field.types.each do |type| %>
-      <div class="hidden"
+  <% end %>
+  <% @field.types.each do |type| %>
+    <div class="hidden"
         data-belongs-to-field-target="type"
         data-type="<%= type %>"
       >
-        <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, label: type.to_s.underscore.humanize do %>
-          <% if @field.searchable %>
-            <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form, field: @field, type: type, model_key: model_keys[type.to_s], foreign_key: "#{@field.foreign_key}_id" %>
-          <% else %>
-            <%= @form.select "#{@field.foreign_key}_id", options_for_select(@field.values_for_type(type), @field.value&.class == type ? @field.field_value : nil),
-              {
-                include_blank: @field.placeholder,
-              },
-              {
-                class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
-                disabled: disabled
-              }
-            %>
-          <% end %>
+      <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, label: type.to_s.underscore.humanize do %>
+        <% if @field.searchable %>
+          <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form, field: @field, type: type, model_key: model_keys[type.to_s], foreign_key: "#{@field.foreign_key}_id" %>
+        <% else %>
+          <%= @form.select "#{@field.foreign_key}_id", options_for_select(@field.values_for_type(type), @field.value&.class == type ? @field.field_value : nil),
+            {
+              include_blank: @field.placeholder,
+            },
+            {
+              class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+              disabled: disabled
+            }
+          %>
         <% end %>
-      </div>
-    <% end %>
-  </div>
+      <% end %>
+    </div>
+  <% end %>
+</div>
 <% else %>
   <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
     <% if @field.searchable %>
@@ -69,6 +69,12 @@
           disabled: disabled
         }
       %>
+      <%
+        # If the select field is disabled, no value will be sent. It's how HTML works.
+        # Thus the extra hidden field to actually send the related id to the server.
+        if disabled %>
+        <%= @form.hidden_field @field.foreign_key %>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>

data/app/controllers/avo/base_controller.rb

@@ -7,7 +7,6 @@ module Avo
     before_action :hydrate_resource
     before_action :set_model, only: [:show, :edit, :destroy, :update]
     before_action :set_model_to_fill
-    before_action :fill_model, only: [:create, :update]
     before_action :authorize_action
     before_action :reset_pagination_if_filters_changed, only: :index
     before_action :cache_applied_filters, only: :index
@@ -113,6 +112,7 @@ module Avo
 
     def create
       # model gets instantiated and filled in the fill_model method
+      fill_model
       saved = @model.save
       @resource.hydrate(model: @model, view: :new, user: _current_user)
 
@@ -166,6 +166,7 @@ module Avo
 
     def update
       # model gets instantiated and filled in the fill_model method
+      fill_model
       saved = @model.save
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 

data/lib/avo/fields/key_value_field.rb

@@ -44,10 +44,10 @@ module Avo
 
       def options
         {
-          # key_label: @key_label,
-          # value_label: @value_label,
-          # action_text: @action_text,
-          # delete_text: @delete_text,
+          key_label: @key_label,
+          value_label: @value_label,
+          action_text: @action_text,
+          delete_text: @delete_text,
           disable_editing_keys: @disable_editing_keys,
           disable_adding_rows: @disable_adding_rows,
           disable_deleting_rows: @disable_deleting_rows

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.20.2.pre.1"
+  VERSION = "1.21.1.pre.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 1.20.2.pre.1
+  version: 1.21.1.pre.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails