avo 1.22.0 → 1.22.1.pre.1

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

@@ -59,6 +59,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}_id" %>
+            <% end %>
         <% end %>
       <% end %>
     </div>
@@ -78,6 +84,7 @@
       <%= @form.select @field.foreign_key, @field.options.map { |o| [o[:label], o[:value]] },
         {
           include_blank: @field.placeholder,
+          value: @field.value
         },
         {
           class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),

data/app/javascript/js/controllers/fields/belongs_to_field_controller.js

@@ -74,6 +74,13 @@ export default class extends Controller {
         if (select) {
           select.setAttribute('valid-name', select.getAttribute('name'))
         }
+        const hiddenInput = target.querySelector('input[type="hidden"]')
+        if (hiddenInput) {
+          hiddenInput.setAttribute(
+            'valid-name',
+            hiddenInput.getAttribute('name'),
+          )
+        }
 
         if (this.selectedType !== type) {
           select.selectedIndex = 0
@@ -105,7 +112,9 @@ export default class extends Controller {
       hiddenInput.setAttribute('name', hiddenInput.getAttribute('valid-name'))
     } else {
       const select = target.querySelector('select')
+      const hiddenInput = target.querySelector('input[type="hidden"]')
       select.setAttribute('name', select.getAttribute('valid-name'))
+      hiddenInput.setAttribute('name', hiddenInput.getAttribute('valid-name'))
     }
   }
 
@@ -122,6 +131,7 @@ export default class extends Controller {
     } else if (target) {
       try {
         target.querySelector('select').setAttribute('name', '')
+        target.querySelector('input[type="hidden"]').setAttribute('name', '')
       } catch (error) {}
     }
   }

data/db/factories.rb

@@ -17,7 +17,7 @@ FactoryBot.define do
   end
 
   factory :post do
-    name { Faker::Quote.famous_last_words }
+    name { Faker::Quote.unique.famous_last_words }
     body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
     is_featured { [true, false].sample }
     published_at do

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.22.0"
+  VERSION = "1.22.1.pre.1"
 end

data/public/avo-assets/avo.js

@@ -81113,6 +81113,10 @@
           if (select) {
             select.setAttribute("valid-name", select.getAttribute("name"));
           }
+          const hiddenInput = target.querySelector('input[type="hidden"]');
+          if (hiddenInput) {
+            hiddenInput.setAttribute("valid-name", hiddenInput.getAttribute("name"));
+          }
           if (this.selectedType !== type) {
             select.selectedIndex = 0;
           }
@@ -81134,7 +81138,9 @@
         hiddenInput.setAttribute("name", hiddenInput.getAttribute("valid-name"));
       } else {
         const select = target.querySelector("select");
+        const hiddenInput = target.querySelector('input[type="hidden"]');
         select.setAttribute("name", select.getAttribute("valid-name"));
+        hiddenInput.setAttribute("name", hiddenInput.getAttribute("valid-name"));
       }
     }
     invalidateTarget(target) {
@@ -81147,6 +81153,7 @@
       } else if (target) {
         try {
           target.querySelector("select").setAttribute("name", "");
+          target.querySelector('input[type="hidden"]').setAttribute("name", "");
         } catch (error2) {
         }
       }