From bb2a68b1d04d435931acd89beefa9e238f9711bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Wed, 12 Aug 2020 10:50:39 +0200 Subject: [PATCH] chore(jenkins): ran prettier --- packages/app/src/apis.ts | 8 +--- .../src/components/EntityPage/EntityPage.tsx | 21 ++++---- .../JenkinsBuildsWidget.tsx | 12 ++--- .../JenkinsLastBuildWidget.tsx | 48 +++++++------------ .../pages/BuildsPage/lib/Builds/Builds.tsx | 17 ++----- .../lib/Status/JenkinsRunStatus.tsx | 13 +++-- .../src/pages/BuildsPage/lib/Status/index.ts | 2 +- plugins/jenkins/src/plugin.ts | 3 +- 8 files changed, 54 insertions(+), 70 deletions(-) diff --git a/packages/app/src/apis.ts b/packages/app/src/apis.ts index d07bfbcec1..d9e3302146 100644 --- a/packages/app/src/apis.ts +++ b/packages/app/src/apis.ts @@ -62,8 +62,7 @@ import { GithubActionsClient, githubActionsApiRef, } from '@backstage/plugin-github-actions'; -import {jenkinsApiRef, JenkinsApi} from "@backstage/plugin-jenkins"; - +import { jenkinsApiRef, JenkinsApi } from '@backstage/plugin-jenkins'; import { TravisCIApi, travisCIApiRef } from '@roadiehq/backstage-plugin-travis-ci'; @@ -87,10 +86,7 @@ export const apis = (config: ConfigApi) => { new CircleCIApi(`${backendUrl}/proxy/circleci/api`), ); - builder.add( - jenkinsApiRef, - new JenkinsApi(`${backendUrl}/proxy/jenkins/api`), - ); + builder.add(jenkinsApiRef, new JenkinsApi(`${backendUrl}/proxy/jenkins/api`)); builder.add(githubActionsApiRef, new GithubActionsClient()); diff --git a/plugins/catalog/src/components/EntityPage/EntityPage.tsx b/plugins/catalog/src/components/EntityPage/EntityPage.tsx index c459b721ac..5dd35bf8db 100644 --- a/plugins/catalog/src/components/EntityPage/EntityPage.tsx +++ b/plugins/catalog/src/components/EntityPage/EntityPage.tsx @@ -29,7 +29,10 @@ import { } from '@backstage/core'; import { SentryIssuesWidget } from '@backstage/plugin-sentry'; import { Widget as GithubActionsWidget } from '@backstage/plugin-github-actions'; -import { JenkinsBuildsWidget, JenkinsLastBuildWidget } from '@backstage/plugin-jenkins'; +import { + JenkinsBuildsWidget, + JenkinsLastBuildWidget, +} from '@backstage/plugin-jenkins'; import { Grid, Box } from '@material-ui/core'; import { Alert } from '@material-ui/lab'; import React, { FC, useEffect, useState } from 'react'; @@ -190,17 +193,17 @@ export const EntityPage: FC<{}> = () => { {entity.metadata?.annotations?.[ 'backstage.io/jenkins-github-folder' - ] && ( - - - + ] && ( + + + )} {entity.metadata?.annotations?.[ 'backstage.io/jenkins-github-folder' - ] && ( - - - + ] && ( + + + )} {entity.metadata?.annotations?.[ 'backstage.io/github-actions-id' diff --git a/plugins/jenkins/src/components/JenkinsPluginWidget/JenkinsBuildsWidget.tsx b/plugins/jenkins/src/components/JenkinsPluginWidget/JenkinsBuildsWidget.tsx index c9f606f334..469869af69 100644 --- a/plugins/jenkins/src/components/JenkinsPluginWidget/JenkinsBuildsWidget.tsx +++ b/plugins/jenkins/src/components/JenkinsPluginWidget/JenkinsBuildsWidget.tsx @@ -15,15 +15,13 @@ */ import React from 'react'; -import {Builds} from '../../pages/BuildsPage/lib/Builds'; -import {Entity} from "@backstage/catalog-model"; +import { Builds } from '../../pages/BuildsPage/lib/Builds'; +import { Entity } from '@backstage/catalog-model'; -export const JenkinsBuildsWidget = ({entity}: { - entity: Entity; -}) => { +export const JenkinsBuildsWidget = ({ entity }: { entity: Entity }) => { const [owner, repo] = ( entity?.metadata.annotations?.['backstage.io/jenkins-github-folder'] ?? '/' ).split('/'); - + return ; -} +}; diff --git a/plugins/jenkins/src/components/JenkinsPluginWidget/JenkinsLastBuildWidget.tsx b/plugins/jenkins/src/components/JenkinsPluginWidget/JenkinsLastBuildWidget.tsx index f81d276a2e..9bd16bf9e6 100644 --- a/plugins/jenkins/src/components/JenkinsPluginWidget/JenkinsLastBuildWidget.tsx +++ b/plugins/jenkins/src/components/JenkinsPluginWidget/JenkinsLastBuildWidget.tsx @@ -15,19 +15,11 @@ */ import React from 'react'; import { Entity } from '@backstage/catalog-model'; -import { - Link, - Theme, - makeStyles, - LinearProgress, -} from '@material-ui/core'; -import { - InfoCard, - StructuredMetadataTable, -} from '@backstage/core'; +import { Link, Theme, makeStyles, LinearProgress } from '@material-ui/core'; +import { InfoCard, StructuredMetadataTable } from '@backstage/core'; import ExternalLinkIcon from '@material-ui/icons/Launch'; -import {useBuilds} from "../../state"; -import {JenkinsRunStatus} from "../../pages/BuildsPage/lib/Status"; +import { useBuilds } from '../../state'; +import { JenkinsRunStatus } from '../../pages/BuildsPage/lib/Status'; const useStyles = makeStyles({ externalLinkIcon: { @@ -37,9 +29,9 @@ const useStyles = makeStyles({ }); const WidgetContent = ({ - loading, - lastRun, - }: { + loading, + lastRun, +}: { loading?: boolean; lastRun: any; branch: string; @@ -51,7 +43,9 @@ const WidgetContent = ({ metadata={{ status: ( <> - + ), build: lastRun.fullDisplayName, @@ -67,28 +61,22 @@ const WidgetContent = ({ }; export const JenkinsLastBuildWidget = ({ - entity, - branch = 'master', - }: { + entity, + branch = 'master', +}: { entity: Entity; branch: string; }) => { const [owner, repo] = ( entity?.metadata.annotations?.['backstage.io/jenkins-github-folder'] ?? '/' ).split('/'); - const [ - {loading, value} - ] = useBuilds(owner, repo, branch); - - const lastRun = value ?? {} ; - + const [{ loading, value }] = useBuilds(owner, repo, branch); + + const lastRun = value ?? {}; + return ( - + ); }; diff --git a/plugins/jenkins/src/pages/BuildsPage/lib/Builds/Builds.tsx b/plugins/jenkins/src/pages/BuildsPage/lib/Builds/Builds.tsx index b08c0ac855..79f081c82d 100644 --- a/plugins/jenkins/src/pages/BuildsPage/lib/Builds/Builds.tsx +++ b/plugins/jenkins/src/pages/BuildsPage/lib/Builds/Builds.tsx @@ -14,20 +14,13 @@ * limitations under the License. */ import React from 'react'; -import {CITable} from '../CITable'; -import {useBuilds} from '../../../../state'; - -export const Builds = ({ - owner, - repo - }: { - owner: string; - repo: string; -}) => { +import { CITable } from '../CITable'; +import { useBuilds } from '../../../../state'; +export const Builds = ({ owner, repo }: { owner: string; repo: string }) => { const [ - {total, loading, value, projectName, page, pageSize}, - {setPage, retry, setPageSize}, + { total, loading, value, projectName, page, pageSize }, + { setPage, retry, setPageSize }, ] = useBuilds(owner, repo); return ( { if (status === undefined) return null; diff --git a/plugins/jenkins/src/pages/BuildsPage/lib/Status/index.ts b/plugins/jenkins/src/pages/BuildsPage/lib/Status/index.ts index 928d91c61d..f5dd4a55e5 100644 --- a/plugins/jenkins/src/pages/BuildsPage/lib/Status/index.ts +++ b/plugins/jenkins/src/pages/BuildsPage/lib/Status/index.ts @@ -13,4 +13,4 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -export { JenkinsRunStatus } from './JenkinsRunStatus' +export { JenkinsRunStatus } from './JenkinsRunStatus'; diff --git a/plugins/jenkins/src/plugin.ts b/plugins/jenkins/src/plugin.ts index 62fd3a108e..979b0a31cf 100644 --- a/plugins/jenkins/src/plugin.ts +++ b/plugins/jenkins/src/plugin.ts @@ -15,14 +15,13 @@ */ import { createPlugin, createRouteRef } from '@backstage/core'; -import {DetailedViewPage} from "./pages/BuildWithStepsPage"; +import { DetailedViewPage } from './pages/BuildWithStepsPage'; export const buildRouteRef = createRouteRef({ path: '/jenkins/job', title: 'Jenkins run', }); - export const plugin = createPlugin({ id: 'jenkins', register({ router }) {