diff --git a/plugins/git-release-manager/src/GitReleaseManager.tsx b/plugins/git-release-manager/src/GitReleaseManager.tsx index 9b10d5d16d..2a2adf3e12 100644 --- a/plugins/git-release-manager/src/GitReleaseManager.tsx +++ b/plugins/git-release-manager/src/GitReleaseManager.tsx @@ -18,6 +18,7 @@ import React from 'react'; import { useAsync } from 'react-use'; import { Alert } from '@material-ui/lab'; import { useApi, ContentHeader } from '@backstage/core'; +import { Box } from '@material-ui/core'; import { ComponentConfig, @@ -34,7 +35,6 @@ import { ProjectContext, Project } from './contexts/ProjectContext'; import { RepoDetailsForm } from './features/RepoDetailsForm/RepoDetailsForm'; import { useQueryHandler } from './hooks/useQueryHandler'; import { UserContext } from './contexts/UserContext'; -import { useStyles } from './styles/styles'; interface GitReleaseManagerProps { project?: Omit; @@ -49,7 +49,6 @@ interface GitReleaseManagerProps { export function GitReleaseManager(props: GitReleaseManagerProps) { const pluginApiClient = useApi(gitReleaseManagerApiRef); - const classes = useStyles(); const { getParsedQuery } = useQueryHandler(); const { parsedQuery } = getParsedQuery(); @@ -89,7 +88,7 @@ export function GitReleaseManager(props: GitReleaseManagerProps) { return ( -
+ @@ -97,7 +96,7 @@ export function GitReleaseManager(props: GitReleaseManagerProps) { {isProjectValid(project) && } -
+
); diff --git a/plugins/git-release-manager/src/components/NoLatestRelease.test.tsx b/plugins/git-release-manager/src/components/NoLatestRelease.test.tsx index 1c2ea3ffa3..6863109448 100644 --- a/plugins/git-release-manager/src/components/NoLatestRelease.test.tsx +++ b/plugins/git-release-manager/src/components/NoLatestRelease.test.tsx @@ -26,28 +26,32 @@ describe('NoLatestRelease', () => { expect(container).toMatchInlineSnapshot(`
diff --git a/plugins/git-release-manager/src/components/NoLatestRelease.tsx b/plugins/git-release-manager/src/components/NoLatestRelease.tsx index b9cf2f6df9..e4121b1f4c 100644 --- a/plugins/git-release-manager/src/components/NoLatestRelease.tsx +++ b/plugins/git-release-manager/src/components/NoLatestRelease.tsx @@ -16,20 +16,19 @@ import React from 'react'; import { Alert } from '@material-ui/lab'; +import { Box } from '@material-ui/core'; -import { useStyles } from '../styles/styles'; import { TEST_IDS } from '../test-helpers/test-ids'; export const NoLatestRelease = () => { - const classes = useStyles(); - return ( - - Unable to find any Release - + + + Unable to find any Release + + ); }; diff --git a/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx b/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx index cdbd79382e..177e9f1195 100644 --- a/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx +++ b/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx @@ -17,6 +17,7 @@ import React, { useState, useEffect } from 'react'; import { Alert, AlertTitle } from '@material-ui/lab'; import { + Box, Button, FormControl, InputLabel, @@ -39,7 +40,6 @@ import { SEMVER_PARTS } from '../../constants/constants'; import { TEST_IDS } from '../../test-helpers/test-ids'; import { useCreateReleaseCandidate } from './hooks/useCreateReleaseCandidate'; import { useProjectContext } from '../../contexts/ProjectContext'; -import { useStyles } from '../../styles/styles'; interface CreateReleaseCandidateProps { defaultBranch: GetRepositoryResult['defaultBranch']; @@ -49,12 +49,11 @@ interface CreateReleaseCandidateProps { } const InfoCardPlusWrapper = ({ children }: { children: React.ReactNode }) => { - const classes = useStyles(); return ( - - Create Release Candidate - + + Create Release Candidate + {children} ); @@ -67,7 +66,6 @@ export const CreateReleaseCandidate = ({ successCb, }: CreateReleaseCandidateProps) => { const { project } = useProjectContext(); - const classes = useStyles(); const [semverBumpLevel, setSemverBumpLevel] = useState<'major' | 'minor'>( SEMVER_PARTS.minor, @@ -129,10 +127,7 @@ export const CreateReleaseCandidate = ({ {project.versioningStrategy === 'semver' && latestRelease && !conflictingPreRelease && ( -
+ Select bump severity @@ -150,26 +145,30 @@ export const CreateReleaseCandidate = ({ -
+ )} {conflictingPreRelease || tagAlreadyExists ? ( <> {conflictingPreRelease && ( - - The most recent release is already a Release Candidate - + + + The most recent release is already a Release Candidate + + )} {tagAlreadyExists && ( - - There's already a tag named{' '} - {releaseCandidateGitInfo.rcReleaseTag} - + + + There's already a tag named{' '} + {releaseCandidateGitInfo.rcReleaseTag} + + )} ) : ( -
+ -
+ )} - ); - } - - return ( -
- - - - - -
+ ); }; diff --git a/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx b/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx index 915330aaf4..efee800969 100644 --- a/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx +++ b/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { Alert, AlertTitle } from '@material-ui/lab'; -import { Typography } from '@material-ui/core'; +import { Box, Typography } from '@material-ui/core'; import { ComponentConfigPromoteRc } from '../../types/types'; import { GetLatestReleaseResult } from '../../api/GitReleaseApiClient'; @@ -24,7 +24,6 @@ import { InfoCardPlus } from '../../components/InfoCardPlus'; import { NoLatestRelease } from '../../components/NoLatestRelease'; import { PromoteRcBody } from './PromoteRcBody'; import { TEST_IDS } from '../../test-helpers/test-ids'; -import { useStyles } from '../../styles/styles'; interface PromoteRcProps { latestRelease: GetLatestReleaseResult; @@ -32,8 +31,6 @@ interface PromoteRcProps { } export const PromoteRc = ({ latestRelease, successCb }: PromoteRcProps) => { - const classes = useStyles(); - function Body() { if (latestRelease === null) { return ; @@ -41,14 +38,17 @@ export const PromoteRc = ({ latestRelease, successCb }: PromoteRcProps) => { if (!latestRelease.prerelease) { return ( - - Latest Git release is not a Release Candidate - One can only promote Release Candidates to Release Versions - + + + + Latest Git release is not a Release Candidate + + One can only promote Release Candidates to Release Versions + + ); } @@ -57,9 +57,9 @@ export const PromoteRc = ({ latestRelease, successCb }: PromoteRcProps) => { return ( - - Promote Release Candidate - + + Promote Release Candidate + diff --git a/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx b/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx index 6841c21d86..5cc8def9e2 100644 --- a/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx +++ b/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx @@ -15,7 +15,7 @@ */ import React from 'react'; -import { Button, Typography } from '@material-ui/core'; +import { Button, Typography, Box } from '@material-ui/core'; import { ComponentConfigPromoteRc } from '../../types/types'; import { Differ } from '../../components/Differ'; @@ -23,7 +23,6 @@ import { GetLatestReleaseResult } from '../../api/GitReleaseApiClient'; import { ResponseStepDialog } from '../../components/ResponseStepDialog/ResponseStepDialog'; import { TEST_IDS } from '../../test-helpers/test-ids'; import { usePromoteRc } from './hooks/usePromoteRc'; -import { useStyles } from '../../styles/styles'; interface PromoteRcBodyProps { rcRelease: NonNullable; @@ -31,7 +30,6 @@ interface PromoteRcBodyProps { } export const PromoteRcBody = ({ rcRelease, successCb }: PromoteRcBodyProps) => { - const classes = useStyles(); const releaseVersion = rcRelease.tagName.replace('rc-', 'version-'); const { progress, responseSteps, run, runInvoked } = usePromoteRc({ @@ -52,13 +50,21 @@ export const PromoteRcBody = ({ rcRelease, successCb }: PromoteRcBodyProps) => { return ( <> - - Promotes the current Release Candidate to a Release Version. - + + + Promotes the current Release Candidate to a Release Version. + + - - - + + + + +