From a1e12ab502455e070576bd0217ad77e8e3aca838 Mon Sep 17 00:00:00 2001 From: Julius Berger Date: Wed, 6 Jul 2022 11:55:47 +0200 Subject: [PATCH 1/3] set default owner/repo when more than 1 allowed values defined Signed-off-by: Julius Berger --- .../src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx index b36b332d9e..f0ef5ba4b5 100644 --- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx +++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx @@ -89,12 +89,12 @@ export const RepoUrlPicker = ( /* we deal with calling the repo setting here instead of in each components for ease */ useEffect(() => { - if (allowedOwners.length === 1) { + if (allowedOwners.length > 0) { setState(prevState => ({ ...prevState, owner: allowedOwners[0] })); } }, [setState, allowedOwners]); useEffect(() => { - if (allowedRepos.length === 1) { + if (allowedRepos.length > 0) { setState(prevState => ({ ...prevState, repoName: allowedRepos[0] })); } }, [setState, allowedRepos]); From b557e6c58d811f7c5f8ee3668d4e9945db59017c Mon Sep 17 00:00:00 2001 From: Julius Berger Date: Thu, 7 Jul 2022 10:44:23 +0200 Subject: [PATCH 2/3] add changeset Signed-off-by: Julius Berger --- .changeset/cuddly-comics-pump.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/cuddly-comics-pump.md diff --git a/.changeset/cuddly-comics-pump.md b/.changeset/cuddly-comics-pump.md new file mode 100644 index 0000000000..af2c08cd6c --- /dev/null +++ b/.changeset/cuddly-comics-pump.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +Fixed that adding more than one `allowedOwner` or `allowedRepo` in the template config will now still set the first value as default in the initial form state of RepoUrlPicker. From 212aaab976b52a3e6918e419a4e035e093f217b4 Mon Sep 17 00:00:00 2001 From: Julius Berger Date: Thu, 7 Jul 2022 10:46:35 +0200 Subject: [PATCH 3/3] add changeset Signed-off-by: Julius Berger --- .changeset/cuddly-comics-pump.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/cuddly-comics-pump.md b/.changeset/cuddly-comics-pump.md index af2c08cd6c..6d224bd34c 100644 --- a/.changeset/cuddly-comics-pump.md +++ b/.changeset/cuddly-comics-pump.md @@ -2,4 +2,4 @@ '@backstage/plugin-scaffolder': patch --- -Fixed that adding more than one `allowedOwner` or `allowedRepo` in the template config will now still set the first value as default in the initial form state of RepoUrlPicker. +Fixed that adding more than one `allowedOwner` or `allowedRepo` in the template config will now still set the first value as default in the initial form state of `RepoUrlPicker`.