fix: merge overridden params with original params in code interfaces

fixes #375

Author: zachdaniel

lib/transformers/add_form_code_interfaces.ex

@@ -88,7 +88,7 @@ defmodule AshPhoenix.Transformers.AddFormCodeInterfaces do
 
                  Any *additional* options will be passed to the underlying call to build the source, i.e
                  `Ash.ActionInput.for_action/4`, or `Ash.Changeset.for_*`. This means you can set things
-                 like the tenant/actor. These will be retained, and provided again when 
+                 like the tenant/actor. These will be retained, and provided again when
                  `Form.submit/3` is called.
 
                  ## Nested Form Options
@@ -124,7 +124,7 @@ defmodule AshPhoenix.Transformers.AddFormCodeInterfaces do
 
                  Any *additional* options will be passed to the underlying call to build the source, i.e
                  `Ash.ActionInput.for_action/4`, or `Ash.Changeset.for_*`. This means you can set things
-                 like the tenant/actor. These will be retained, and provided again when 
+                 like the tenant/actor. These will be retained, and provided again when
                  `Form.submit/3` is called.
 
                  ## Nested Form Options
@@ -142,8 +142,8 @@ defmodule AshPhoenix.Transformers.AddFormCodeInterfaces do
                 |> unquote(__MODULE__).set_private_arguments(unquote(private_args_merge))
 
               AshPhoenix.Form.for_action(unquote(resource), unquote(action.name), form_opts)
-              |> Map.put(:params, unquote(merge_params))
-              |> Map.put(:raw_params, unquote(merge_params))
+              |> Map.update!(:params, &Map.merge(&1, unquote(merge_params)))
+              |> Map.update!(:raw_params, &Map.merge(&1, unquote(merge_params)))
             end
           end
 

test/ash_phoenix_test.exs

@@ -22,4 +22,18 @@ defmodule AshPhoenixTest do
     assert %AshPhoenix.Form{data: %{id: ^id}} =
              AshPhoenix.Test.Domain.form_to_update_user(%AshPhoenix.Test.User{id: id})
   end
+
+  test "adding a form retains original params" do
+    form =
+      AshPhoenix.Test.Domain.form_to_create_post(
+        params: %{"text" => "original text", "title" => "original title"}
+      )
+
+    assert AshPhoenix.Form.value(form, :text) == "original text"
+
+    form =
+      AshPhoenix.Form.add_form(form, :comments, params: %{"text" => "new comment"})
+
+    assert AshPhoenix.Form.value(form, :text) == "original text"
+  end
 end

test/support/domain.ex

@@ -15,6 +15,10 @@ defmodule AshPhoenix.Test.Domain do
       define_calculation :always_true
     end
 
+    resource AshPhoenix.Test.Post do
+      define :create_post, action: :create
+    end
+
     resource(AshPhoenix.Test.DeepNestedUnionResource)
     resource(AshPhoenix.Test.SimplePost)
   end