From 3ec10f407ea01b7f47f274dba3208c7d3f0e7bcb Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Wed, 28 Sep 2022 11:47:22 +0200 Subject: [PATCH 01/10] added header options to scaffolder page props Signed-off-by: Alex Rybchenko --- plugins/scaffolder/src/components/Router.tsx | 6 ++++++ .../src/components/ScaffolderPage/ScaffolderPage.tsx | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx index 021d73f5e9..097eddf6cd 100644 --- a/plugins/scaffolder/src/components/Router.tsx +++ b/plugins/scaffolder/src/components/Router.tsx @@ -63,6 +63,11 @@ export type RouterProps = { filter: (entity: Entity) => boolean; }>; defaultPreviewTemplate?: string; + headerOptions?: { + pageTitleOverride?: string; + title?: string; + subtitle?: string; + }; /** * Options for the context menu on the scaffolder page. */ @@ -143,6 +148,7 @@ export const Router = (props: RouterProps) => { groups={groups} TemplateCardComponent={TemplateCardComponent} contextMenu={props.contextMenu} + headerOptions={props.headerOptions} /> } /> diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx index 60a761d171..9c13db72b1 100644 --- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx +++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx @@ -54,12 +54,18 @@ export type ScaffolderPageProps = { actions?: boolean; tasks?: boolean; }; + headerOptions?: { + pageTitleOverride?: string; + title?: string; + subtitle?: string; + }; }; export const ScaffolderPageContents = ({ TemplateCardComponent, groups, contextMenu, + headerOptions, }: ScaffolderPageProps) => { const registerComponentLink = useRouteRef(registerComponentRouteRef); const otherTemplatesGroup = { @@ -80,6 +86,7 @@ export const ScaffolderPageContents = ({ pageTitleOverride="Create a New Component" title="Create a New Component" subtitle="Create new software components using standard templates" + {...headerOptions} > @@ -134,12 +141,14 @@ export const ScaffolderPage = ({ TemplateCardComponent, groups, contextMenu, + headerOptions, }: ScaffolderPageProps) => ( ); From a3f1340f3ccf43ffdc2010f971f1684db6163770 Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Wed, 28 Sep 2022 11:47:52 +0200 Subject: [PATCH 02/10] exported scaffolder routes Signed-off-by: Alex Rybchenko --- plugins/scaffolder/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts index e68eece8e5..440c87c363 100644 --- a/plugins/scaffolder/src/index.ts +++ b/plugins/scaffolder/src/index.ts @@ -61,6 +61,7 @@ export { scaffolderPlugin, } from './plugin'; export * from './components'; +export * from './routes'; export type { TaskPageProps } from './components/TaskPage'; /** next exports */ From edae17309e7e0e0007dc2176bbb226ed7717db5c Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Wed, 28 Sep 2022 11:52:36 +0200 Subject: [PATCH 03/10] added changeset Signed-off-by: Alex Rybchenko --- .changeset/sixty-islands-develop.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/sixty-islands-develop.md diff --git a/.changeset/sixty-islands-develop.md b/.changeset/sixty-islands-develop.md new file mode 100644 index 0000000000..75af6bcc70 --- /dev/null +++ b/.changeset/sixty-islands-develop.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +Added props to override default Scaffolder page title, subtitle and pageTitleOverride From 7d8734c35cb2bfcae40388bc7dbffb38da234cf4 Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Wed, 28 Sep 2022 15:30:51 +0200 Subject: [PATCH 04/10] updated api report Signed-off-by: Alex Rybchenko --- plugins/scaffolder/api-report.md | 75 ++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md index cf69736bd4..193497a849 100644 --- a/plugins/scaffolder/api-report.md +++ b/plugins/scaffolder/api-report.md @@ -24,10 +24,12 @@ import { JsonObject } from '@backstage/types'; import { JSONSchema7 } from 'json-schema'; import { JsonValue } from '@backstage/types'; import { Observable } from '@backstage/types'; +import { PathParams } from '@backstage/core-plugin-api'; import { PropsWithChildren } from 'react'; import { default as React_2 } from 'react'; import { RouteRef } from '@backstage/core-plugin-api'; import { ScmIntegrationRegistry } from '@backstage/integration'; +import { SubRouteRef } from '@backstage/core-plugin-api'; import { TaskSpec } from '@backstage/plugin-scaffolder-common'; import { TaskStep } from '@backstage/plugin-scaffolder-common'; import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common'; @@ -42,6 +44,11 @@ export function createNextScaffolderFieldExtension< options: NextFieldExtensionOptions, ): Extension>; +// Warning: (ae-missing-release-tag) "actionsRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const actionsRouteRef: SubRouteRef; + // @public export function createScaffolderFieldExtension< TReturnValue = unknown, @@ -64,6 +71,11 @@ export type CustomFieldValidator = ( }, ) => void | Promise; +// Warning: (ae-missing-release-tag) "editRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const editRouteRef: SubRouteRef; + // @public export const EntityNamePickerFieldExtension: FieldExtensionComponent< string, @@ -144,6 +156,13 @@ export interface LayoutOptions

{ // @public export type LayoutTemplate = FormProps['ObjectFieldTemplate']; +// Warning: (ae-missing-release-tag) "legacySelectedTemplateRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public @deprecated (undocumented) +export const legacySelectedTemplateRouteRef: SubRouteRef< + PathParams<'/templates/:templateName'> +>; + // @public export type ListActionsResponse = Array<{ id: string; @@ -167,6 +186,11 @@ export type LogEvent = { taskId: string; }; +// Warning: (ae-missing-release-tag) "nextRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const nextRouteRef: RouteRef; + // @alpha export type NextCustomFieldValidator = ( data: TFieldReturnValue, @@ -215,6 +239,13 @@ export const NextScaffolderPage: ( props: PropsWithChildren, ) => JSX.Element; +// Warning: (ae-missing-release-tag) "nextSelectedTemplateRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const nextSelectedTemplateRouteRef: SubRouteRef< + PathParams<'/templates/:namespace/:templateName'> +>; + // @public export const OwnedEntityPickerFieldExtension: FieldExtensionComponent< string, @@ -249,6 +280,11 @@ export interface OwnerPickerUiOptions { defaultNamespace?: string | false; } +// Warning: (ae-missing-release-tag) "registerComponentRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const registerComponentRouteRef: ExternalRouteRef; + // @public export const repoPickerValidation: ( value: string, @@ -287,6 +323,11 @@ export interface RepoUrlPickerUiOptions { }; } +// Warning: (ae-missing-release-tag) "rootRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const rootRouteRef: RouteRef; + // @public export type RouterProps = { components?: { @@ -302,6 +343,11 @@ export type RouterProps = { filter: (entity: Entity) => boolean; }>; defaultPreviewTemplate?: string; + headerOptions?: { + pageTitleOverride?: string; + title?: string; + subtitle?: string; + }; contextMenu?: { editor?: boolean; actions?: boolean; @@ -424,6 +470,11 @@ export interface ScaffolderGetIntegrationsListResponse { // @public export const ScaffolderLayouts: React.ComponentType; +// Warning: (ae-missing-release-tag) "scaffolderListTaskRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const scaffolderListTaskRouteRef: SubRouteRef; + // @public (undocumented) export type ScaffolderOutputLink = { title?: string; @@ -494,6 +545,11 @@ export type ScaffolderTaskOutput = { [key: string]: unknown; }; +// Warning: (ae-missing-release-tag) "scaffolderTaskRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const scaffolderTaskRouteRef: SubRouteRef>; + // @public export type ScaffolderTaskStatus = | 'open' @@ -508,6 +564,13 @@ export interface ScaffolderUseTemplateSecrets { setSecrets: (input: Record) => void; } +// Warning: (ae-missing-release-tag) "selectedTemplateRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const selectedTemplateRouteRef: SubRouteRef< + PathParams<'/templates/:namespace/:templateName'> +>; + // @public export const TaskPage: ({ loadingText }: TaskPageProps) => JSX.Element; @@ -538,4 +601,16 @@ export const TemplateTypePicker: () => JSX.Element | null; // @public export const useTemplateSecrets: () => ScaffolderUseTemplateSecrets; + +// Warning: (ae-missing-release-tag) "viewTechDocRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const viewTechDocRouteRef: ExternalRouteRef< + { + name: string; + kind: string; + namespace: string; + }, + true +>; ``` From 36985448d9e87d51d33fa30258a69a5db7171ff3 Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Thu, 29 Sep 2022 16:49:56 +0200 Subject: [PATCH 05/10] updated api docs Signed-off-by: Alex Rybchenko --- plugins/scaffolder/api-report.md | 24 +----------------------- plugins/scaffolder/src/routes.ts | 11 +++++++++++ 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md index 193497a849..5931e127f5 100644 --- a/plugins/scaffolder/api-report.md +++ b/plugins/scaffolder/api-report.md @@ -44,8 +44,6 @@ export function createNextScaffolderFieldExtension< options: NextFieldExtensionOptions, ): Extension>; -// Warning: (ae-missing-release-tag) "actionsRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// // @public (undocumented) export const actionsRouteRef: SubRouteRef; @@ -71,8 +69,6 @@ export type CustomFieldValidator = ( }, ) => void | Promise; -// Warning: (ae-missing-release-tag) "editRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// // @public (undocumented) export const editRouteRef: SubRouteRef; @@ -156,9 +152,7 @@ export interface LayoutOptions

{ // @public export type LayoutTemplate = FormProps['ObjectFieldTemplate']; -// Warning: (ae-missing-release-tag) "legacySelectedTemplateRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public @deprecated (undocumented) +// @public (undocumented) export const legacySelectedTemplateRouteRef: SubRouteRef< PathParams<'/templates/:templateName'> >; @@ -186,8 +180,6 @@ export type LogEvent = { taskId: string; }; -// Warning: (ae-missing-release-tag) "nextRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// // @public (undocumented) export const nextRouteRef: RouteRef; @@ -239,8 +231,6 @@ export const NextScaffolderPage: ( props: PropsWithChildren, ) => JSX.Element; -// Warning: (ae-missing-release-tag) "nextSelectedTemplateRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// // @public (undocumented) export const nextSelectedTemplateRouteRef: SubRouteRef< PathParams<'/templates/:namespace/:templateName'> @@ -280,8 +270,6 @@ export interface OwnerPickerUiOptions { defaultNamespace?: string | false; } -// Warning: (ae-missing-release-tag) "registerComponentRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// // @public (undocumented) export const registerComponentRouteRef: ExternalRouteRef; @@ -323,8 +311,6 @@ export interface RepoUrlPickerUiOptions { }; } -// Warning: (ae-missing-release-tag) "rootRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// // @public (undocumented) export const rootRouteRef: RouteRef; @@ -470,8 +456,6 @@ export interface ScaffolderGetIntegrationsListResponse { // @public export const ScaffolderLayouts: React.ComponentType; -// Warning: (ae-missing-release-tag) "scaffolderListTaskRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// // @public (undocumented) export const scaffolderListTaskRouteRef: SubRouteRef; @@ -545,8 +529,6 @@ export type ScaffolderTaskOutput = { [key: string]: unknown; }; -// Warning: (ae-missing-release-tag) "scaffolderTaskRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// // @public (undocumented) export const scaffolderTaskRouteRef: SubRouteRef>; @@ -564,8 +546,6 @@ export interface ScaffolderUseTemplateSecrets { setSecrets: (input: Record) => void; } -// Warning: (ae-missing-release-tag) "selectedTemplateRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// // @public (undocumented) export const selectedTemplateRouteRef: SubRouteRef< PathParams<'/templates/:namespace/:templateName'> @@ -602,8 +582,6 @@ export const TemplateTypePicker: () => JSX.Element | null; // @public export const useTemplateSecrets: () => ScaffolderUseTemplateSecrets; -// Warning: (ae-missing-release-tag) "viewTechDocRouteRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// // @public (undocumented) export const viewTechDocRouteRef: ExternalRouteRef< { diff --git a/plugins/scaffolder/src/routes.ts b/plugins/scaffolder/src/routes.ts index 5e2d191443..26e25b54a2 100644 --- a/plugins/scaffolder/src/routes.ts +++ b/plugins/scaffolder/src/routes.ts @@ -19,17 +19,20 @@ import { createSubRouteRef, } from '@backstage/core-plugin-api'; +/** @public */ export const registerComponentRouteRef = createExternalRouteRef({ id: 'register-component', optional: true, }); +/** @public */ export const viewTechDocRouteRef = createExternalRouteRef({ id: 'view-techdoc', optional: true, params: ['namespace', 'kind', 'name'], }); +/** @public */ export const rootRouteRef = createRouteRef({ id: 'scaffolder', }); @@ -37,28 +40,33 @@ export const rootRouteRef = createRouteRef({ /** * @deprecated This is the old template route, can be deleted before next major release */ +/** @public */ export const legacySelectedTemplateRouteRef = createSubRouteRef({ id: 'scaffolder/legacy/selected-template', parent: rootRouteRef, path: '/templates/:templateName', }); +/** @public */ export const nextRouteRef = createRouteRef({ id: 'scaffolder/next', }); +/** @public */ export const selectedTemplateRouteRef = createSubRouteRef({ id: 'scaffolder/selected-template', parent: rootRouteRef, path: '/templates/:namespace/:templateName', }); +/** @public */ export const nextSelectedTemplateRouteRef = createSubRouteRef({ id: 'scaffolder/next/selected-template', parent: nextRouteRef, path: '/templates/:namespace/:templateName', }); +/** @public */ export const scaffolderTaskRouteRef = createSubRouteRef({ id: 'scaffolder/task', parent: rootRouteRef, @@ -71,18 +79,21 @@ export const nextScaffolderTaskRouteRef = createSubRouteRef({ path: '/tasks/:taskId', }); +/** @public */ export const scaffolderListTaskRouteRef = createSubRouteRef({ id: 'scaffolder/list-tasks', parent: rootRouteRef, path: '/tasks', }); +/** @public */ export const actionsRouteRef = createSubRouteRef({ id: 'scaffolder/actions', parent: rootRouteRef, path: '/actions', }); +/** @public */ export const editRouteRef = createSubRouteRef({ id: 'scaffolder/edit', parent: rootRouteRef, From b6640cd762aec813d537b51b23046e0a2342bb8a Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Fri, 30 Sep 2022 15:12:19 +0200 Subject: [PATCH 06/10] export selected routes only Signed-off-by: Alex Rybchenko --- .changeset/sixty-islands-develop.md | 2 +- plugins/scaffolder/api-report.md | 34 ++--------------------------- plugins/scaffolder/src/index.ts | 7 +++++- plugins/scaffolder/src/routes.ts | 11 ++-------- 4 files changed, 11 insertions(+), 43 deletions(-) diff --git a/.changeset/sixty-islands-develop.md b/.changeset/sixty-islands-develop.md index 75af6bcc70..1afcc5730a 100644 --- a/.changeset/sixty-islands-develop.md +++ b/.changeset/sixty-islands-develop.md @@ -2,4 +2,4 @@ '@backstage/plugin-scaffolder': patch --- -Added props to override default Scaffolder page title, subtitle and pageTitleOverride +Added props to override default Scaffolder page title, subtitle and pageTitleOverride. diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md index 5931e127f5..e759049233 100644 --- a/plugins/scaffolder/api-report.md +++ b/plugins/scaffolder/api-report.md @@ -44,9 +44,6 @@ export function createNextScaffolderFieldExtension< options: NextFieldExtensionOptions, ): Extension>; -// @public (undocumented) -export const actionsRouteRef: SubRouteRef; - // @public export function createScaffolderFieldExtension< TReturnValue = unknown, @@ -69,9 +66,6 @@ export type CustomFieldValidator = ( }, ) => void | Promise; -// @public (undocumented) -export const editRouteRef: SubRouteRef; - // @public export const EntityNamePickerFieldExtension: FieldExtensionComponent< string, @@ -152,11 +146,6 @@ export interface LayoutOptions

{ // @public export type LayoutTemplate = FormProps['ObjectFieldTemplate']; -// @public (undocumented) -export const legacySelectedTemplateRouteRef: SubRouteRef< - PathParams<'/templates/:templateName'> ->; - // @public export type ListActionsResponse = Array<{ id: string; @@ -180,7 +169,7 @@ export type LogEvent = { taskId: string; }; -// @public (undocumented) +// @alpha (undocumented) export const nextRouteRef: RouteRef; // @alpha @@ -231,7 +220,7 @@ export const NextScaffolderPage: ( props: PropsWithChildren, ) => JSX.Element; -// @public (undocumented) +// @alpha (undocumented) export const nextSelectedTemplateRouteRef: SubRouteRef< PathParams<'/templates/:namespace/:templateName'> >; @@ -270,9 +259,6 @@ export interface OwnerPickerUiOptions { defaultNamespace?: string | false; } -// @public (undocumented) -export const registerComponentRouteRef: ExternalRouteRef; - // @public export const repoPickerValidation: ( value: string, @@ -456,9 +442,6 @@ export interface ScaffolderGetIntegrationsListResponse { // @public export const ScaffolderLayouts: React.ComponentType; -// @public (undocumented) -export const scaffolderListTaskRouteRef: SubRouteRef; - // @public (undocumented) export type ScaffolderOutputLink = { title?: string; @@ -529,9 +512,6 @@ export type ScaffolderTaskOutput = { [key: string]: unknown; }; -// @public (undocumented) -export const scaffolderTaskRouteRef: SubRouteRef>; - // @public export type ScaffolderTaskStatus = | 'open' @@ -581,14 +561,4 @@ export const TemplateTypePicker: () => JSX.Element | null; // @public export const useTemplateSecrets: () => ScaffolderUseTemplateSecrets; - -// @public (undocumented) -export const viewTechDocRouteRef: ExternalRouteRef< - { - name: string; - kind: string; - namespace: string; - }, - true ->; ``` diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts index 440c87c363..7853667101 100644 --- a/plugins/scaffolder/src/index.ts +++ b/plugins/scaffolder/src/index.ts @@ -61,7 +61,12 @@ export { scaffolderPlugin, } from './plugin'; export * from './components'; -export * from './routes'; +export { + rootRouteRef, + nextRouteRef, + selectedTemplateRouteRef, + nextSelectedTemplateRouteRef, +} from './routes'; export type { TaskPageProps } from './components/TaskPage'; /** next exports */ diff --git a/plugins/scaffolder/src/routes.ts b/plugins/scaffolder/src/routes.ts index 26e25b54a2..7451a3a943 100644 --- a/plugins/scaffolder/src/routes.ts +++ b/plugins/scaffolder/src/routes.ts @@ -19,13 +19,11 @@ import { createSubRouteRef, } from '@backstage/core-plugin-api'; -/** @public */ export const registerComponentRouteRef = createExternalRouteRef({ id: 'register-component', optional: true, }); -/** @public */ export const viewTechDocRouteRef = createExternalRouteRef({ id: 'view-techdoc', optional: true, @@ -40,14 +38,13 @@ export const rootRouteRef = createRouteRef({ /** * @deprecated This is the old template route, can be deleted before next major release */ -/** @public */ export const legacySelectedTemplateRouteRef = createSubRouteRef({ id: 'scaffolder/legacy/selected-template', parent: rootRouteRef, path: '/templates/:templateName', }); -/** @public */ +/** @alpha */ export const nextRouteRef = createRouteRef({ id: 'scaffolder/next', }); @@ -59,14 +56,13 @@ export const selectedTemplateRouteRef = createSubRouteRef({ path: '/templates/:namespace/:templateName', }); -/** @public */ +/** @alpha */ export const nextSelectedTemplateRouteRef = createSubRouteRef({ id: 'scaffolder/next/selected-template', parent: nextRouteRef, path: '/templates/:namespace/:templateName', }); -/** @public */ export const scaffolderTaskRouteRef = createSubRouteRef({ id: 'scaffolder/task', parent: rootRouteRef, @@ -79,21 +75,18 @@ export const nextScaffolderTaskRouteRef = createSubRouteRef({ path: '/tasks/:taskId', }); -/** @public */ export const scaffolderListTaskRouteRef = createSubRouteRef({ id: 'scaffolder/list-tasks', parent: rootRouteRef, path: '/tasks', }); -/** @public */ export const actionsRouteRef = createSubRouteRef({ id: 'scaffolder/actions', parent: rootRouteRef, path: '/actions', }); -/** @public */ export const editRouteRef = createSubRouteRef({ id: 'scaffolder/edit', parent: rootRouteRef, From dec322b87158e31cdb86f90d262663637e77cae0 Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Tue, 4 Oct 2022 18:45:51 +0200 Subject: [PATCH 07/10] Update .changeset/sixty-islands-develop.md Co-authored-by: Ben Lambert Signed-off-by: Alex Rybchenko --- .changeset/sixty-islands-develop.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/sixty-islands-develop.md b/.changeset/sixty-islands-develop.md index 1afcc5730a..3bdcd344b1 100644 --- a/.changeset/sixty-islands-develop.md +++ b/.changeset/sixty-islands-develop.md @@ -2,4 +2,4 @@ '@backstage/plugin-scaffolder': patch --- -Added props to override default Scaffolder page title, subtitle and pageTitleOverride. +Added props to override default Scaffolder page `title`, `subtitle` and `pageTitleOverride`. From ca0cbd5a022259e11a67b48ddda7f554dd6ed4f2 Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Wed, 12 Oct 2022 15:16:33 +0200 Subject: [PATCH 08/10] updated changeset Signed-off-by: Alex Rybchenko --- .changeset/sixty-islands-develop.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.changeset/sixty-islands-develop.md b/.changeset/sixty-islands-develop.md index 3bdcd344b1..9fbe2b2edd 100644 --- a/.changeset/sixty-islands-develop.md +++ b/.changeset/sixty-islands-develop.md @@ -1,5 +1,11 @@ --- -'@backstage/plugin-scaffolder': patch +'@backstage/plugin-scaffolder': minor --- +<<<<<<< Updated upstream Added props to override default Scaffolder page `title`, `subtitle` and `pageTitleOverride`. +======= +Added props to override default Scaffolder page title, subtitle and pageTitleOverride. +Routes like `rootRouteRef`, `selectedTemplateRouteRef`, `nextRouteRef`, `nextSelectedTemplateRouteRef` were made public and can be used in your app (e.g. in custom TemplateCard component) + +> > > > > > > Stashed changes From afb13576c9060d35a660923b8d0082314f187106 Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Thu, 13 Oct 2022 14:49:37 +0200 Subject: [PATCH 09/10] fixed changeset Signed-off-by: Alex Rybchenko --- .changeset/sixty-islands-develop.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.changeset/sixty-islands-develop.md b/.changeset/sixty-islands-develop.md index 9fbe2b2edd..9eb36cc1a9 100644 --- a/.changeset/sixty-islands-develop.md +++ b/.changeset/sixty-islands-develop.md @@ -2,10 +2,5 @@ '@backstage/plugin-scaffolder': minor --- -<<<<<<< Updated upstream -Added props to override default Scaffolder page `title`, `subtitle` and `pageTitleOverride`. -======= Added props to override default Scaffolder page title, subtitle and pageTitleOverride. -Routes like `rootRouteRef`, `selectedTemplateRouteRef`, `nextRouteRef`, `nextSelectedTemplateRouteRef` were made public and can be used in your app (e.g. in custom TemplateCard component) - -> > > > > > > Stashed changes +Routes like `rootRouteRef`, `selectedTemplateRouteRef`, `nextRouteRef`, `nextSelectedTemplateRouteRef` were made public and can be used in your app (e.g. in custom TemplateCard component). From 5e2347ef682dabaecf1c7fd92fdf915c975a7e8d Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Thu, 13 Oct 2022 15:22:58 +0200 Subject: [PATCH 10/10] updated api report Signed-off-by: Alex Rybchenko --- plugins/scaffolder/api-report.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md index e759049233..158c75e5bd 100644 --- a/plugins/scaffolder/api-report.md +++ b/plugins/scaffolder/api-report.md @@ -169,9 +169,6 @@ export type LogEvent = { taskId: string; }; -// @alpha (undocumented) -export const nextRouteRef: RouteRef; - // @alpha export type NextCustomFieldValidator = ( data: TFieldReturnValue, @@ -204,6 +201,9 @@ export type NextFieldExtensionOptions< validation?: NextCustomFieldValidator; }; +// @alpha (undocumented) +export const nextRouteRef: RouteRef; + // @alpha export type NextRouterProps = { components?: {