From 113a7442d8de8b5d916e1619cb87ffb2bce7cf6c Mon Sep 17 00:00:00 2001 From: Nataliya Issayeva Date: Fri, 3 Dec 2021 16:34:27 -0500 Subject: [PATCH 1/2] Fix scaffolder repo owner bug Signed-off-by: Nataliya Issayeva --- .../src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx index 12931c297f..c4b1e79262 100644 --- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx +++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx @@ -27,7 +27,7 @@ import FormHelperText from '@material-ui/core/FormHelperText'; import { useApi } from '@backstage/core-plugin-api'; import { Progress } from '@backstage/core-components'; -function splitFormData(url: string | undefined, allowedOwners: string[]) { +function splitFormData(url: string | undefined, allowedOwners?: string[]) { let host = undefined; let owner = undefined; let repo = undefined; @@ -39,10 +39,7 @@ function splitFormData(url: string | undefined, allowedOwners: string[]) { if (url) { const parsed = new URL(`https://${url}`); host = parsed.host; - owner = - parsed.searchParams.get('owner') || allowedOwners - ? allowedOwners[0] - : undefined; + owner = parsed.searchParams.get('owner') || allowedOwners?.[0]; repo = parsed.searchParams.get('repo') || undefined; // This is azure dev ops specific. not used for any other provider. organization = parsed.searchParams.get('organization') || undefined; From 2edcf7738f01a6672ed1605da2eaab57246c02cc Mon Sep 17 00:00:00 2001 From: Nataliya Issayeva Date: Fri, 3 Dec 2021 16:48:53 -0500 Subject: [PATCH 2/2] Add changeset Signed-off-by: Nataliya Issayeva --- .changeset/light-pigs-protect.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/light-pigs-protect.md diff --git a/.changeset/light-pigs-protect.md b/.changeset/light-pigs-protect.md new file mode 100644 index 0000000000..358547af8a --- /dev/null +++ b/.changeset/light-pigs-protect.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +Fix bug with setting owner in RepoUrlPicker causing validation failure