From 8e1789e0c312f93ed2fec60fa31f2c961216fec4 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Sun, 7 Feb 2021 23:48:31 +0100 Subject: [PATCH] circleci,cloudbuild,github-actions,jenkins: rename internal entity conditional --- plugins/circleci/src/components/Router.tsx | 4 ++-- plugins/circleci/src/index.ts | 4 ++-- plugins/cloudbuild/src/components/Router.tsx | 4 ++-- plugins/cloudbuild/src/index.ts | 4 ++-- plugins/github-actions/src/components/Router.tsx | 4 ++-- plugins/github-actions/src/index.ts | 4 ++-- plugins/jenkins/src/components/Router.tsx | 4 ++-- plugins/jenkins/src/index.ts | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/plugins/circleci/src/components/Router.tsx b/plugins/circleci/src/components/Router.tsx index b3a0d2c3e2..d18b6c1e61 100644 --- a/plugins/circleci/src/components/Router.tsx +++ b/plugins/circleci/src/components/Router.tsx @@ -24,7 +24,7 @@ import { Entity } from '@backstage/catalog-model'; import { useEntity } from '@backstage/plugin-catalog-react'; import { MissingAnnotationEmptyState } from '@backstage/core'; -export const isPluginApplicableToEntity = (entity: Entity) => +export const isCircleCIAvailable = (entity: Entity) => Boolean(entity.metadata.annotations?.[CIRCLECI_ANNOTATION]); type Props = { @@ -35,7 +35,7 @@ type Props = { export const Router = (_props: Props) => { const { entity } = useEntity(); - if (!isPluginApplicableToEntity(entity)) { + if (!isCircleCIAvailable(entity)) { return ; } diff --git a/plugins/circleci/src/index.ts b/plugins/circleci/src/index.ts index 1e8b213279..2a37cbdee0 100644 --- a/plugins/circleci/src/index.ts +++ b/plugins/circleci/src/index.ts @@ -23,7 +23,7 @@ export * from './api'; export * from './route-refs'; export { Router, - isPluginApplicableToEntity, - isPluginApplicableToEntity as isCircleCIAvailable, + isCircleCIAvailable, + isCircleCIAvailable as isPluginApplicableToEntity, } from './components/Router'; export { CIRCLECI_ANNOTATION } from './constants'; diff --git a/plugins/cloudbuild/src/components/Router.tsx b/plugins/cloudbuild/src/components/Router.tsx index c31947a531..0f71efcf86 100644 --- a/plugins/cloudbuild/src/components/Router.tsx +++ b/plugins/cloudbuild/src/components/Router.tsx @@ -23,7 +23,7 @@ import { WorkflowRunsTable } from './WorkflowRunsTable'; import { CLOUDBUILD_ANNOTATION } from './useProjectName'; import { MissingAnnotationEmptyState } from '@backstage/core'; -export const isPluginApplicableToEntity = (entity: Entity) => +export const isCloudbuildAvailable = (entity: Entity) => Boolean(entity.metadata.annotations?.[CLOUDBUILD_ANNOTATION]); type Props = { @@ -34,7 +34,7 @@ type Props = { export const Router = (_props: Props) => { const { entity } = useEntity(); - if (!isPluginApplicableToEntity(entity)) { + if (!isCloudbuildAvailable(entity)) { // TODO(shmidt-i): move warning to a separate standardized component return ; } diff --git a/plugins/cloudbuild/src/index.ts b/plugins/cloudbuild/src/index.ts index a846792fa2..b7cd6c29d5 100644 --- a/plugins/cloudbuild/src/index.ts +++ b/plugins/cloudbuild/src/index.ts @@ -23,8 +23,8 @@ export { export * from './api'; export { Router, - isPluginApplicableToEntity, - isPluginApplicableToEntity as isCloudbuildAvailable, + isCloudbuildAvailable, + isCloudbuildAvailable as isPluginApplicableToEntity, } from './components/Router'; export * from './components/Cards'; export { CLOUDBUILD_ANNOTATION } from './components/useProjectName'; diff --git a/plugins/github-actions/src/components/Router.tsx b/plugins/github-actions/src/components/Router.tsx index e867b05b18..834fcae43c 100644 --- a/plugins/github-actions/src/components/Router.tsx +++ b/plugins/github-actions/src/components/Router.tsx @@ -23,7 +23,7 @@ import { WorkflowRunsTable } from './WorkflowRunsTable'; import { GITHUB_ACTIONS_ANNOTATION } from './useProjectName'; import { MissingAnnotationEmptyState } from '@backstage/core'; -export const isPluginApplicableToEntity = (entity: Entity) => +export const isGithubActionsAvailable = (entity: Entity) => Boolean(entity.metadata.annotations?.[GITHUB_ACTIONS_ANNOTATION]); type Props = { @@ -34,7 +34,7 @@ type Props = { export const Router = (_props: Props) => { const { entity } = useEntity(); - if (!isPluginApplicableToEntity(entity)) { + if (!isGithubActionsAvailable(entity)) { return ( ); diff --git a/plugins/github-actions/src/index.ts b/plugins/github-actions/src/index.ts index 6dd4807b75..b4179a9d92 100644 --- a/plugins/github-actions/src/index.ts +++ b/plugins/github-actions/src/index.ts @@ -25,8 +25,8 @@ export { export * from './api'; export { Router, - isPluginApplicableToEntity, - isPluginApplicableToEntity as isGithubActionsAvailable, + isGithubActionsAvailable, + isGithubActionsAvailable as isPluginApplicableToEntity, } from './components/Router'; export * from './components/Cards'; export { GITHUB_ACTIONS_ANNOTATION } from './components/useProjectName'; diff --git a/plugins/jenkins/src/components/Router.tsx b/plugins/jenkins/src/components/Router.tsx index e310cd4193..85f06bb0e1 100644 --- a/plugins/jenkins/src/components/Router.tsx +++ b/plugins/jenkins/src/components/Router.tsx @@ -23,7 +23,7 @@ import { Entity } from '@backstage/catalog-model'; import { MissingAnnotationEmptyState } from '@backstage/core'; import { CITable } from './BuildsPage/lib/CITable'; -export const isPluginApplicableToEntity = (entity: Entity) => +export const isJenkinsAvailable = (entity: Entity) => Boolean(entity.metadata.annotations?.[JENKINS_ANNOTATION]); type Props = { @@ -34,7 +34,7 @@ type Props = { export const Router = (_props: Props) => { const { entity } = useEntity(); - if (!isPluginApplicableToEntity(entity)) { + if (!isJenkinsAvailable(entity)) { return ; } diff --git a/plugins/jenkins/src/index.ts b/plugins/jenkins/src/index.ts index 6d0e7837d3..e434e959e8 100644 --- a/plugins/jenkins/src/index.ts +++ b/plugins/jenkins/src/index.ts @@ -23,8 +23,8 @@ export { export { LatestRunCard } from './components/Cards'; export { Router, - isPluginApplicableToEntity, - isPluginApplicableToEntity as isJenkinsAvailable, + isJenkinsAvailable, + isJenkinsAvailable as isPluginApplicableToEntity, } from './components/Router'; export { JENKINS_ANNOTATION } from './constants'; export * from './api';