From d5277b5b54a96750b1992650be1d740dba7341e7 Mon Sep 17 00:00:00 2001 From: Bogdan Nechyporenko Date: Tue, 26 Sep 2023 12:51:30 +0200 Subject: [PATCH 1/7] Auto open log view in NextScaffolderPage Signed-off-by: Bogdan Nechyporenko --- packages/app/src/App.tsx | 1 + plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx | 5 ++++- plugins/scaffolder/src/next/Router/Router.tsx | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx index a0a6419328..b7774ee1b6 100644 --- a/packages/app/src/App.tsx +++ b/packages/app/src/App.tsx @@ -241,6 +241,7 @@ const routes = ( path="/create" element={ ; + logs?: { + autoOpen?: boolean; + }; }) => { // todo(blam): check that task Id actually exists, and that it's valid. otherwise redirect to something more useful. const { taskId } = useParams(); @@ -69,7 +72,7 @@ export const OngoingTask = (props: { [taskStream], ); - const [logsVisible, setLogVisibleState] = useState(false); + const [logsVisible, setLogVisibleState] = useState(props.logs?.autoOpen); const [buttonBarVisible, setButtonBarVisibleState] = useState(true); useEffect(() => { diff --git a/plugins/scaffolder/src/next/Router/Router.tsx b/plugins/scaffolder/src/next/Router/Router.tsx index 2061cd1243..12193ac48b 100644 --- a/plugins/scaffolder/src/next/Router/Router.tsx +++ b/plugins/scaffolder/src/next/Router/Router.tsx @@ -65,6 +65,9 @@ export type NextRouterProps = { TemplateListPageComponent?: React.ComponentType; TemplateWizardPageComponent?: React.ComponentType; }; + logs?: { + autoOpen?: boolean; + }; groups?: TemplateGroupFilter[]; templateFilter?: (entity: TemplateEntityV1beta3) => boolean; // todo(blam): rename this to formProps @@ -139,6 +142,7 @@ export const Router = (props: PropsWithChildren) => { path={scaffolderTaskRouteRef.path} element={ } From 18e6664995f2704e90451d24ca566cd0285e8f98 Mon Sep 17 00:00:00 2001 From: Bogdan Nechyporenko Date: Tue, 26 Sep 2023 12:58:12 +0200 Subject: [PATCH 2/7] Auto open log view in NextScaffolderPage Signed-off-by: Bogdan Nechyporenko --- .changeset/many-timers-double.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/many-timers-double.md diff --git a/.changeset/many-timers-double.md b/.changeset/many-timers-double.md new file mode 100644 index 0000000000..27d569ba8f --- /dev/null +++ b/.changeset/many-timers-double.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +Added a possibility to open logs view in a scaffolder execution panel automatically From 806b9d716b693801211ae1d4e8f3d1defc327a42 Mon Sep 17 00:00:00 2001 From: Bogdan Nechyporenko Date: Tue, 26 Sep 2023 13:18:28 +0200 Subject: [PATCH 3/7] Auto open log view in NextScaffolderPage Signed-off-by: Bogdan Nechyporenko --- plugins/scaffolder/alpha-api-report.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/scaffolder/alpha-api-report.md b/plugins/scaffolder/alpha-api-report.md index 8cacf6105e..788e2b5e00 100644 --- a/plugins/scaffolder/alpha-api-report.md +++ b/plugins/scaffolder/alpha-api-report.md @@ -35,6 +35,9 @@ export type NextRouterProps = { TemplateListPageComponent?: React_2.ComponentType; TemplateWizardPageComponent?: React_2.ComponentType; }; + logs?: { + autoOpen?: boolean; + }; groups?: TemplateGroupFilter[]; templateFilter?: (entity: TemplateEntityV1beta3) => boolean; FormProps?: FormProps_2; From d842f6c88050a07df1b9b43bfeafbca9a933f828 Mon Sep 17 00:00:00 2001 From: Bogdan Nechyporenko Date: Tue, 26 Sep 2023 13:32:15 +0200 Subject: [PATCH 4/7] Update plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Fredrik Adelöw Signed-off-by: Bogdan Nechyporenko --- plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx b/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx index b6517808be..e856076908 100644 --- a/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx +++ b/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx @@ -72,7 +72,7 @@ export const OngoingTask = (props: { [taskStream], ); - const [logsVisible, setLogVisibleState] = useState(props.logs?.autoOpen); + const [logsVisible, setLogVisibleState] = useState(props.logs?.autoOpen ?? false); const [buttonBarVisible, setButtonBarVisibleState] = useState(true); useEffect(() => { From 230f3bf8a60ee696e6ccc59cba3d6fd148ab7e79 Mon Sep 17 00:00:00 2001 From: Bogdan Nechyporenko Date: Tue, 3 Oct 2023 15:00:21 +0200 Subject: [PATCH 5/7] Added a visibility log button to a panel Signed-off-by: Bogdan Nechyporenko --- .changeset/many-timers-double.md | 5 ----- packages/app/src/App.tsx | 1 - plugins/scaffolder/alpha-api-report.md | 3 --- .../src/next/OngoingTask/OngoingTask.tsx | 16 ++++++++++++---- plugins/scaffolder/src/next/Router/Router.tsx | 4 ---- 5 files changed, 12 insertions(+), 17 deletions(-) delete mode 100644 .changeset/many-timers-double.md diff --git a/.changeset/many-timers-double.md b/.changeset/many-timers-double.md deleted file mode 100644 index 27d569ba8f..0000000000 --- a/.changeset/many-timers-double.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-scaffolder': patch ---- - -Added a possibility to open logs view in a scaffolder execution panel automatically diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx index 8757367338..f2b7d66b21 100644 --- a/packages/app/src/App.tsx +++ b/packages/app/src/App.tsx @@ -241,7 +241,6 @@ const routes = ( path="/create" element={ ; TemplateWizardPageComponent?: React_2.ComponentType; }; - logs?: { - autoOpen?: boolean; - }; groups?: TemplateGroupFilter[]; templateFilter?: (entity: TemplateEntityV1beta3) => boolean; FormProps?: FormProps_2; diff --git a/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx b/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx index e856076908..b483cd27cb 100644 --- a/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx +++ b/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx @@ -46,15 +46,15 @@ const useStyles = makeStyles(theme => ({ cancelButton: { marginRight: theme.spacing(1), }, + logsVisibilityButton: { + marginRight: theme.spacing(1), + }, })); export const OngoingTask = (props: { TemplateOutputsComponent?: React.ComponentType<{ output?: ScaffolderTaskOutput; }>; - logs?: { - autoOpen?: boolean; - }; }) => { // todo(blam): check that task Id actually exists, and that it's valid. otherwise redirect to something more useful. const { taskId } = useParams(); @@ -72,7 +72,7 @@ export const OngoingTask = (props: { [taskStream], ); - const [logsVisible, setLogVisibleState] = useState(props.logs?.autoOpen ?? false); + const [logsVisible, setLogVisibleState] = useState(false); const [buttonBarVisible, setButtonBarVisibleState] = useState(true); useEffect(() => { @@ -191,6 +191,14 @@ export const OngoingTask = (props: { > Cancel +