From dcf9e728ded4ae969593a1b552181958108fd41e Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 20 Oct 2022 11:34:37 +0200 Subject: [PATCH] xcmetrics: removed hidden build details route Signed-off-by: Patrik Oldsberg --- .changeset/spotty-dryers-explain.md | 5 +++ .../components/BuildsPage/BuildsPage.test.tsx | 43 ------------------- .../src/components/BuildsPage/BuildsPage.tsx | 37 ---------------- .../src/components/BuildsPage/index.ts | 16 ------- .../XcmetricsLayout/XcmetricsLayout.tsx | 4 +- 5 files changed, 7 insertions(+), 98 deletions(-) create mode 100644 .changeset/spotty-dryers-explain.md delete mode 100644 plugins/xcmetrics/src/components/BuildsPage/BuildsPage.test.tsx delete mode 100644 plugins/xcmetrics/src/components/BuildsPage/BuildsPage.tsx delete mode 100644 plugins/xcmetrics/src/components/BuildsPage/index.ts diff --git a/.changeset/spotty-dryers-explain.md b/.changeset/spotty-dryers-explain.md new file mode 100644 index 0000000000..41bef3fbf7 --- /dev/null +++ b/.changeset/spotty-dryers-explain.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-xcmetrics': patch +--- + +Removed an unused and hidden build details route. diff --git a/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.test.tsx b/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.test.tsx deleted file mode 100644 index 75e31427ae..0000000000 --- a/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.test.tsx +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2021 The Backstage Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import React from 'react'; -import { renderInTestApp } from '@backstage/test-utils'; -import { BuildsPage } from './BuildsPage'; - -jest.mock('../BuildDetails', () => ({ - withRequest: (component: any) => component, - BuildDetails: () => 'BuildDetails', -})); - -jest.mock('../BuildList', () => ({ - BuildList: () => 'BuildList', -})); - -describe('BuildPage', () => { - it('should render BuildDetails if build id is provided in path', async () => { - const rendered = await renderInTestApp(, { - routeEntries: [`/buildId`], - }); - - expect(rendered.getByText('BuildDetails')).toBeInTheDocument(); - }); - - it('should render BuildList if no build id is provided in path', async () => { - const rendered = await renderInTestApp(); - - expect(rendered.getByText('BuildList')).toBeInTheDocument(); - }); -}); diff --git a/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.tsx b/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.tsx deleted file mode 100644 index 152337707d..0000000000 --- a/plugins/xcmetrics/src/components/BuildsPage/BuildsPage.tsx +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2021 The Backstage Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import React from 'react'; -import { useRouteRefParams } from '@backstage/core-plugin-api'; -import { buildsRouteRef } from '../../routes'; -import { BuildList } from '../BuildList'; -import { BuildDetails, withRequest } from '../BuildDetails'; -import { InfoCard } from '@backstage/core-components'; - -export const BuildsPage = () => { - const { '*': buildId } = useRouteRefParams(buildsRouteRef) ?? { '*': '' }; - - if (buildId) { - const BuildDetailsWithRequest = withRequest(BuildDetails); - - return ( - - - - ); - } - - return ; -}; diff --git a/plugins/xcmetrics/src/components/BuildsPage/index.ts b/plugins/xcmetrics/src/components/BuildsPage/index.ts deleted file mode 100644 index 47fe9166df..0000000000 --- a/plugins/xcmetrics/src/components/BuildsPage/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2021 The Backstage Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -export { BuildsPage } from './BuildsPage'; diff --git a/plugins/xcmetrics/src/components/XcmetricsLayout/XcmetricsLayout.tsx b/plugins/xcmetrics/src/components/XcmetricsLayout/XcmetricsLayout.tsx index a21918e322..b2c6ca6ec8 100644 --- a/plugins/xcmetrics/src/components/XcmetricsLayout/XcmetricsLayout.tsx +++ b/plugins/xcmetrics/src/components/XcmetricsLayout/XcmetricsLayout.tsx @@ -23,7 +23,7 @@ import { } from '@backstage/core-components'; import { Overview } from '../Overview'; import { buildsRouteRef } from '../../routes'; -import { BuildsPage } from '../BuildsPage'; +import { BuildList } from '../BuildList'; export interface TabConfig { path: string; @@ -40,7 +40,7 @@ const TABS: TabConfig[] = [ { path: buildsRouteRef.path, title: 'Builds', - component: , + component: , }, ];