From 66769117e4038a6ddc5bd93f8c11d12c44dd2526 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 16 Mar 2022 11:42:12 +0100 Subject: [PATCH 1/4] chore: remove the Lifecycle components Signed-off-by: blam --- .../src/components/ScaffolderPage/ScaffolderPage.tsx | 6 +----- plugins/scaffolder/src/components/TaskPage/TaskPage.tsx | 6 +----- .../scaffolder/src/components/TemplatePage/TemplatePage.tsx | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx index 0b3fccc07c..850da00de0 100644 --- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx +++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx @@ -82,11 +82,7 @@ export const ScaffolderPageContents = ({
- Create a New Component - - } + title={<>Create a New Component} subtitle="Create new software components using standard templates" /> diff --git a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx index f73e32189c..232c1ad7a8 100644 --- a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx +++ b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx @@ -315,11 +315,7 @@ export const TaskPage = ({ loadingText }: TaskPageProps) => {
- Task Activity - - } + title={<>Task Activity} subtitle={`Activity for task: ${taskId}`} /> diff --git a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx index 5310a4c79f..a2b6d20ca4 100644 --- a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx +++ b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx @@ -183,11 +183,7 @@ export const TemplatePage = ({
- Create a New Component - - } + title={<>Create a New Component} subtitle="Create new software components using standard templates" /> From 0db6e76f67f399eb7daa3ddeeb22b0f3fe778529 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 16 Mar 2022 11:43:38 +0100 Subject: [PATCH 2/4] chore: remove fragments Signed-off-by: blam --- .../scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx | 2 +- plugins/scaffolder/src/components/TaskPage/TaskPage.tsx | 2 +- plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx index 850da00de0..ecd2ebf5fc 100644 --- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx +++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx @@ -82,7 +82,7 @@ export const ScaffolderPageContents = ({
Create a New Component} + title="Create a New Component" subtitle="Create new software components using standard templates" /> diff --git a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx index 232c1ad7a8..63a3a8b4ae 100644 --- a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx +++ b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx @@ -315,7 +315,7 @@ export const TaskPage = ({ loadingText }: TaskPageProps) => {
Task Activity} + title="Task Activity" subtitle={`Activity for task: ${taskId}`} /> diff --git a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx index a2b6d20ca4..064e134ffc 100644 --- a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx +++ b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx @@ -183,7 +183,7 @@ export const TemplatePage = ({
Create a New Component} + title="Create a New Component" subtitle="Create new software components using standard templates" /> From 9b7e36178324d30c770c84873ff82aa03972bf23 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 16 Mar 2022 11:44:18 +0100 Subject: [PATCH 3/4] chore: removing beta labels from the plugin Signed-off-by: blam --- .changeset/cold-pets-retire.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/cold-pets-retire.md diff --git a/.changeset/cold-pets-retire.md b/.changeset/cold-pets-retire.md new file mode 100644 index 0000000000..1ab64f919e --- /dev/null +++ b/.changeset/cold-pets-retire.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +Remove beta labels From a9db6aefa5625cbb61e32264b303cd99a370d60a Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 16 Mar 2022 12:04:01 +0100 Subject: [PATCH 4/4] chore: woops. Remove the export too; Signed-off-by: blam --- .../src/components/ScaffolderPage/ScaffolderPage.tsx | 1 - plugins/scaffolder/src/components/TaskPage/TaskPage.tsx | 1 - .../src/components/TemplatePage/TemplatePage.tsx | 8 +------- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx index ecd2ebf5fc..13ab2e7d37 100644 --- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx +++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx @@ -19,7 +19,6 @@ import { ContentHeader, CreateButton, Header, - Lifecycle, Page, SupportButton, } from '@backstage/core-components'; diff --git a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx index 63a3a8b4ae..27d89cb6a4 100644 --- a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx +++ b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx @@ -19,7 +19,6 @@ import { Content, ErrorPage, Header, - Lifecycle, Page, LogViewer, Progress, diff --git a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx index 064e134ffc..fc1c4f222d 100644 --- a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx +++ b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx @@ -27,13 +27,7 @@ import { SecretsContext } from '../secrets/SecretsContext'; import { rootRouteRef, scaffolderTaskRouteRef } from '../../routes'; import { MultistepJsonForm } from '../MultistepJsonForm'; -import { - Content, - Header, - InfoCard, - Lifecycle, - Page, -} from '@backstage/core-components'; +import { Content, Header, InfoCard, Page } from '@backstage/core-components'; import { ApiHolder, errorApiRef,