From a8bcbe656d7b489a71aead19f40e90f3a45666d7 Mon Sep 17 00:00:00 2001 From: Emma Indal Date: Mon, 9 Sep 2024 14:29:20 +0200 Subject: [PATCH 1/5] remove default title on ContentHeaderTitle Signed-off-by: Emma Indal --- .../src/layout/ContentHeader/ContentHeader.test.tsx | 7 +++++++ .../src/layout/ContentHeader/ContentHeader.tsx | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx b/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx index 37059766a8..5ae2efb806 100644 --- a/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx +++ b/packages/core-components/src/layout/ContentHeader/ContentHeader.test.tsx @@ -30,6 +30,13 @@ describe('', () => { rendered.getByText('Title'); }); + it('should render without title', async () => { + const rendered = await renderInTestApp( + content, + ); + rendered.getByText('content'); + }); + it('should render with titleComponent', async () => { const title = 'Custom title'; const titleComponent =

{title}

; diff --git a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx index 381919a170..e2a6e70620 100644 --- a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx +++ b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx @@ -73,10 +73,7 @@ type ContentHeaderTitleProps = { className?: string; }; -const ContentHeaderTitle = ({ - title = 'Unknown page', - className, -}: ContentHeaderTitleProps) => ( +const ContentHeaderTitle = ({ title, className }: ContentHeaderTitleProps) => ( Date: Mon, 9 Sep 2024 14:30:04 +0200 Subject: [PATCH 2/5] remove title on template list page Signed-off-by: Emma Indal --- .../scaffolder/src/next/TemplateListPage/TemplateListPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx index 4042506d1e..4c95027af7 100644 --- a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx +++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx @@ -177,7 +177,7 @@ export const TemplateListPage = (props: TemplateListPageProps) => { - + Date: Mon, 9 Sep 2024 14:30:36 +0200 Subject: [PATCH 3/5] update translations for scaffolder Signed-off-by: Emma Indal --- plugins/scaffolder/src/translation.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/scaffolder/src/translation.ts b/plugins/scaffolder/src/translation.ts index d97c3f6f05..3518ed2c53 100644 --- a/plugins/scaffolder/src/translation.ts +++ b/plugins/scaffolder/src/translation.ts @@ -261,7 +261,6 @@ export const scaffolderTranslationRef = createTranslationRef({ otherTitle: 'Other Templates', }, contentHeader: { - title: 'Available Templates', registerExistingButtonTitle: 'Register Existing Component', supportButtonTitle: 'Create new software components using standard templates. Different templates create different kinds of components (services, websites, documentation, ...).', From 094433409c6a8fc640aad9f3f69727f0060d9287 Mon Sep 17 00:00:00 2001 From: Emma Indal Date: Tue, 10 Sep 2024 09:42:44 +0200 Subject: [PATCH 4/5] add changesets Signed-off-by: Emma Indal --- .changeset/bright-pillows-confess.md | 5 +++++ .changeset/slimy-hornets-explode.md | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 .changeset/bright-pillows-confess.md create mode 100644 .changeset/slimy-hornets-explode.md diff --git a/.changeset/bright-pillows-confess.md b/.changeset/bright-pillows-confess.md new file mode 100644 index 0000000000..aa7210ffb8 --- /dev/null +++ b/.changeset/bright-pillows-confess.md @@ -0,0 +1,5 @@ +--- +'@backstage/core-components': patch +--- + +Removed default title set to Unknown page on `ContentHeaderTitle` component to support usage of component without title prop. diff --git a/.changeset/slimy-hornets-explode.md b/.changeset/slimy-hornets-explode.md new file mode 100644 index 0000000000..7f29061ab3 --- /dev/null +++ b/.changeset/slimy-hornets-explode.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +Removed duplicated titles on Scaffolder `TemplateListPage` component From a4050e17d6e90d9f36604a210e57745573c302ae Mon Sep 17 00:00:00 2001 From: Emma Indal Date: Tue, 10 Sep 2024 10:00:42 +0200 Subject: [PATCH 5/5] update api reports Signed-off-by: Emma Indal --- plugins/scaffolder/api-report-alpha.md | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/scaffolder/api-report-alpha.md b/plugins/scaffolder/api-report-alpha.md index 555ab2ac13..b5ed1ed849 100644 --- a/plugins/scaffolder/api-report-alpha.md +++ b/plugins/scaffolder/api-report-alpha.md @@ -230,7 +230,6 @@ export const scaffolderTranslationRef: TranslationRef< readonly 'templateListPage.pageTitle': 'Create a new component'; readonly 'templateListPage.templateGroups.defaultTitle': 'Templates'; readonly 'templateListPage.templateGroups.otherTitle': 'Other Templates'; - readonly 'templateListPage.contentHeader.title': 'Available Templates'; readonly 'templateListPage.contentHeader.registerExistingButtonTitle': 'Register Existing Component'; readonly 'templateListPage.contentHeader.supportButtonTitle': 'Create new software components using standard templates. Different templates create different kinds of components (services, websites, documentation, ...).'; readonly 'templateListPage.additionalLinksForEntity.viewTechDocsTitle': 'View TechDocs';