From b337d78c3b53cee9370a78fda072fc1fca0524fd Mon Sep 17 00:00:00 2001 From: npiyush97 Date: Tue, 19 Sep 2023 15:08:53 +0530 Subject: [PATCH 1/2] added suggested changes Signed-off-by: npiyush97 --- .changeset/large-comics-knock.md | 5 +++++ .../src/components/TemplateEditorPage/TemplateEditorForm.tsx | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .changeset/large-comics-knock.md diff --git a/.changeset/large-comics-knock.md b/.changeset/large-comics-knock.md new file mode 100644 index 0000000000..860172579e --- /dev/null +++ b/.changeset/large-comics-knock.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +fixed issue related template editor fails with multiple templates per file. diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx index 315028219b..15a44cf918 100644 --- a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx +++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx @@ -123,7 +123,10 @@ export function TemplateEditorForm(props: TemplateEditorFormProps) { setSteps(undefined); return; } - const parsed: JsonValue = yaml.parse(content); + const parsed: JsonValue = yaml + .parseAllDocuments(content) + .map(c => c.toJSON()) + .filter(c => c)[0]; if (!isJsonObject(parsed)) { setSteps(undefined); From 5af17aa5830423a22fc50a04c2520c14b8773006 Mon Sep 17 00:00:00 2001 From: npiyush97 Date: Tue, 19 Sep 2023 16:40:28 +0530 Subject: [PATCH 2/2] =?UTF-8?q?fixed=20the=20fix=20=F0=9F=98=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: npiyush97 --- .../src/components/TemplateEditorPage/TemplateEditorForm.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx index 15a44cf918..2a726110b8 100644 --- a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx +++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx @@ -125,8 +125,8 @@ export function TemplateEditorForm(props: TemplateEditorFormProps) { } const parsed: JsonValue = yaml .parseAllDocuments(content) - .map(c => c.toJSON()) - .filter(c => c)[0]; + .filter(c => c) + .map(c => c.toJSON())[0]; if (!isJsonObject(parsed)) { setSteps(undefined);