From 98ae18b68f3eb7bd37046241da8f44cab2decd3c Mon Sep 17 00:00:00 2001
From: Peter Macdonald <macdonald.peter90@gmail.com>
Date: Sun, 2 Oct 2022 16:28:33 +0200
Subject: [PATCH] Fixed the allowedOwners from resetting everytime you leave
 the drop-down or enter stuff in the next input field this should fix #13730

Signed-off-by: Peter Macdonald <macdonald.peter90@gmail.com>

Fixed the allowedOwners from resetting everytime you leave the drop-down or enter stuff in the next input field this should fix #13730 (added changeset)

Signed-off-by: Peter Macdonald <macdonald.peter90@gmail.com>

Better, improved, test passing fix for the bug

Signed-off-by: Peter Macdonald <macdonald.peter90@gmail.com>

Changed changeset file to ignore allowedOwners with backticks

Signed-off-by: Peter Macdonald <macdonald.peter90@gmail.com>
---
 .changeset/old-melons-bathe.md                               | 5 +++++
 .../src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/old-melons-bathe.md

diff --git a/.changeset/old-melons-bathe.md b/.changeset/old-melons-bathe.md
new file mode 100644
index 0000000000..1a0db03b6e
--- /dev/null
+++ b/.changeset/old-melons-bathe.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fixed the `allowedOwners` from resetting itself when you make a selection or leave the Allowed Owners drop down and start typing in an input below it
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
index 14fbfcee0b..75f5d998ab 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
@@ -106,7 +106,7 @@ export const RepoUrlPicker = (
     if (allowedOwners.length > 0) {
       setState(prevState => ({
         ...prevState,
-        owner: allowedOwners[0],
+        allowedOwners,
       }));
     }
   }, [setState, allowedOwners]);
@@ -174,9 +174,9 @@ export const RepoUrlPicker = (
       {hostType === 'github' && (
         <GithubRepoPicker
           allowedOwners={allowedOwners}
+          onChange={updateLocalState}
           rawErrors={rawErrors}
           state={state}
-          onChange={updateLocalState}
         />
       )}
       {hostType === 'gitlab' && (