From f6c15d8080a9a7669b962074df709ce76d9b141f Mon Sep 17 00:00:00 2001
From: "cindy.chen" <cindy.chen@jkos.com>
Date: Sat, 21 Sep 2024 18:28:57 +0800
Subject: [PATCH 1/2] Apply `defaultValue` props in `MultiEntityPicker`

Signed-off-by: cindy.chen <cindy.chen@jkos.com>
---
 .changeset/curly-foxes-brake.md                    | 14 ++++++++++++++
 .../fields/MultiEntityPicker/MultiEntityPicker.tsx |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 .changeset/curly-foxes-brake.md

diff --git a/.changeset/curly-foxes-brake.md b/.changeset/curly-foxes-brake.md
new file mode 100644
index 0000000000..31b74f2ac2
--- /dev/null
+++ b/.changeset/curly-foxes-brake.md
@@ -0,0 +1,14 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Apply `defaultValue` props in `MultiEntityPicker`
+
+```diff
+  <Autocomplete
+    multiple
+    filterSelectedOptions
+    disabled={entities?.entities?.length === 1}
+    id={idSchema?.$id}
++   defaultValue={formData}
+```
diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
index f514bfc2bb..9da3f4021e 100644
--- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
@@ -152,6 +152,7 @@ export const MultiEntityPicker = (props: MultiEntityPickerProps) => {
         filterSelectedOptions
         disabled={entities?.entities?.length === 1}
         id={idSchema?.$id}
+        defaultValue={formData}
         loading={loading}
         onChange={onSelect}
         options={entities?.entities || []}

From 5b1e195a699f04d8aa9abab4bb1428ba75ae9d2b Mon Sep 17 00:00:00 2001
From: 0126cloud <58761160+0126cloud@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:57:30 +0800
Subject: [PATCH 2/2] Update curly-foxes-brake.md

Remove diff bit

Signed-off-by: 0126cloud <58761160+0126cloud@users.noreply.github.com>
---
 .changeset/curly-foxes-brake.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.changeset/curly-foxes-brake.md b/.changeset/curly-foxes-brake.md
index 31b74f2ac2..6946f30371 100644
--- a/.changeset/curly-foxes-brake.md
+++ b/.changeset/curly-foxes-brake.md
@@ -3,12 +3,3 @@
 ---
 
 Apply `defaultValue` props in `MultiEntityPicker`
-
-```diff
-  <Autocomplete
-    multiple
-    filterSelectedOptions
-    disabled={entities?.entities?.length === 1}
-    id={idSchema?.$id}
-+   defaultValue={formData}
-```