From 769238d195a2e733db4907578612b0037351cdca Mon Sep 17 00:00:00 2001 From: Abhay-soni-developer Date: Thu, 5 Oct 2023 14:11:14 +0530 Subject: [PATCH] changes based upon feedback from maintainers Signed-off-by: Abhay-soni-developer --- .changeset/spicy-poets-sell.md | 2 +- plugins/jenkins/src/api/JenkinsApi.ts | 1 + .../jenkins/src/components/BuildsPage/lib/CITable/index.ts | 2 -- plugins/jenkins/src/components/Router.tsx | 6 +----- plugins/jenkins/src/index.ts | 4 ---- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.changeset/spicy-poets-sell.md b/.changeset/spicy-poets-sell.md index 2f08c1bcf9..4bebd71344 100644 --- a/.changeset/spicy-poets-sell.md +++ b/.changeset/spicy-poets-sell.md @@ -1,5 +1,5 @@ --- -'@backstage/plugin-jenkins': minor +'@backstage/plugin-jenkins': patch --- Extend EntityJenkinsContent to receive columns as prop diff --git a/plugins/jenkins/src/api/JenkinsApi.ts b/plugins/jenkins/src/api/JenkinsApi.ts index 04bd313227..83b38e63f0 100644 --- a/plugins/jenkins/src/api/JenkinsApi.ts +++ b/plugins/jenkins/src/api/JenkinsApi.ts @@ -57,6 +57,7 @@ export interface Build { status: string; // == building ? 'running' : result, } +/** @public */ export interface Project { // standard Jenkins lastBuild: Build; diff --git a/plugins/jenkins/src/components/BuildsPage/lib/CITable/index.ts b/plugins/jenkins/src/components/BuildsPage/lib/CITable/index.ts index cb00501bb9..3be4dae9ce 100644 --- a/plugins/jenkins/src/components/BuildsPage/lib/CITable/index.ts +++ b/plugins/jenkins/src/components/BuildsPage/lib/CITable/index.ts @@ -14,5 +14,3 @@ * limitations under the License. */ export { CITable } from './CITable'; -export { columnFactories as ciTableColumnFactories } from './columns'; -export { defaultCITableColumns } from './presets'; diff --git a/plugins/jenkins/src/components/Router.tsx b/plugins/jenkins/src/components/Router.tsx index 58dd93b550..364b5fde0b 100644 --- a/plugins/jenkins/src/components/Router.tsx +++ b/plugins/jenkins/src/components/Router.tsx @@ -33,11 +33,7 @@ export const isJenkinsAvailable = (entity: Entity) => Boolean(entity.metadata.annotations?.[JENKINS_ANNOTATION]) || Boolean(entity.metadata.annotations?.[LEGACY_JENKINS_ANNOTATION]); -type Props = { - columns?: TableColumn[]; -}; - -export const Router = (props: Props) => { +export const Router = (props: { columns?: TableColumn[] }) => { const { entity } = useEntity(); if (!isJenkinsAvailable(entity)) { diff --git a/plugins/jenkins/src/index.ts b/plugins/jenkins/src/index.ts index d1f2b6d8c9..7562026bdc 100644 --- a/plugins/jenkins/src/index.ts +++ b/plugins/jenkins/src/index.ts @@ -34,7 +34,3 @@ export { } from './components/Router'; export { JENKINS_ANNOTATION, LEGACY_JENKINS_ANNOTATION } from './constants'; export * from './api'; -export { - ciTableColumnFactories, - defaultCITableColumns, -} from './components/BuildsPage/lib/CITable';