From 9c0f87acc7b75f15bd82b7449062243463557bbf Mon Sep 17 00:00:00 2001 From: Erik Engervall Date: Thu, 13 Jan 2022 13:25:55 +0100 Subject: [PATCH 1/4] Improve Patch CTA copy Signed-off-by: Erik Engervall --- .../src/features/Patch/Patch.tsx | 17 +++++++++++++---- .../src/features/Patch/PatchBody.tsx | 6 ++++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/plugins/git-release-manager/src/features/Patch/Patch.tsx b/plugins/git-release-manager/src/features/Patch/Patch.tsx index c902ab0dc5..6088538161 100644 --- a/plugins/git-release-manager/src/features/Patch/Patch.tsx +++ b/plugins/git-release-manager/src/features/Patch/Patch.tsx @@ -40,24 +40,32 @@ export const Patch = ({ releaseBranch, onSuccess, }: PatchProps) => { + const ctaMessage = `Patch Release ${ + latestRelease?.prerelease ? 'Candidate' : 'Version' + }`; + return ( - - Patch Release {latestRelease?.prerelease ? 'Candidate' : 'Version'} - + {ctaMessage} ); }; -function BodyWrapper({ latestRelease, releaseBranch, onSuccess }: PatchProps) { +function BodyWrapper({ + latestRelease, + releaseBranch, + onSuccess, + ctaMessage, +}: PatchProps & { ctaMessage: string }) { const { project } = useProjectContext(); if (latestRelease === null) { @@ -93,6 +101,7 @@ function BodyWrapper({ latestRelease, releaseBranch, onSuccess }: PatchProps) { releaseBranch={releaseBranch} onSuccess={onSuccess} tagParts={bumpedTag.tagParts} + ctaMessage={ctaMessage} /> ); } diff --git a/plugins/git-release-manager/src/features/Patch/PatchBody.tsx b/plugins/git-release-manager/src/features/Patch/PatchBody.tsx index 98303890c8..c5429e389a 100644 --- a/plugins/git-release-manager/src/features/Patch/PatchBody.tsx +++ b/plugins/git-release-manager/src/features/Patch/PatchBody.tsx @@ -58,6 +58,7 @@ interface PatchBodyProps { releaseBranch: GetBranchResult['branch']; onSuccess?: ComponentConfig['onSuccess']; tagParts: NonNullable; + ctaMessage: string; } export const PatchBody = ({ @@ -66,6 +67,7 @@ export const PatchBody = ({ releaseBranch, onSuccess, tagParts, + ctaMessage, }: PatchBodyProps) => { const pluginApiClient = useApi(gitReleaseManagerApiRef); const { project } = useProjectContext(); @@ -106,7 +108,7 @@ export const PatchBody = ({ ); } @@ -320,7 +322,7 @@ export const PatchBody = ({ run(selectedPatchCommit); }} > - Patch Release Candidate + {ctaMessage} ); From c1813739c64f9c261259e95b425611736e87fa56 Mon Sep 17 00:00:00 2001 From: Erik Engervall Date: Thu, 13 Jan 2022 13:27:29 +0100 Subject: [PATCH 2/4] Add changeset Signed-off-by: Erik Engervall --- .changeset/funny-carrots-breathe.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/funny-carrots-breathe.md diff --git a/.changeset/funny-carrots-breathe.md b/.changeset/funny-carrots-breathe.md new file mode 100644 index 0000000000..5706e027e7 --- /dev/null +++ b/.changeset/funny-carrots-breathe.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-git-release-manager': patch +--- + +Improved copy for patch CTA From de065ce91c55033c3054b7e950418efddd7d9c9d Mon Sep 17 00:00:00 2001 From: Erik Engervall Date: Thu, 13 Jan 2022 14:06:21 +0100 Subject: [PATCH 3/4] Fix tests Signed-off-by: Erik Engervall --- .../git-release-manager/src/features/Patch/PatchBody.test.tsx | 3 +++ plugins/git-release-manager/src/test-helpers/test-helpers.ts | 2 ++ 2 files changed, 5 insertions(+) diff --git a/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx b/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx index d3e215d6d3..765cd82de2 100644 --- a/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx +++ b/plugins/git-release-manager/src/features/Patch/PatchBody.test.tsx @@ -24,6 +24,7 @@ import { mockReleaseCandidateCalver, mockReleaseVersionCalver, mockTagParts, + mockCtaMessage, } from '../../test-helpers/test-helpers'; import { mockApiClient } from '../../test-helpers/mock-api-client'; import { PatchBody } from './PatchBody'; @@ -60,6 +61,7 @@ describe('PatchBody', () => { latestRelease={mockReleaseCandidateCalver} releaseBranch={mockReleaseBranch} tagParts={mockTagParts} + ctaMessage={mockCtaMessage} />, ); @@ -77,6 +79,7 @@ describe('PatchBody', () => { releaseBranch={mockReleaseBranch} bumpedTag={mockBumpedTag} tagParts={mockTagParts} + ctaMessage={mockCtaMessage} />, ); diff --git a/plugins/git-release-manager/src/test-helpers/test-helpers.ts b/plugins/git-release-manager/src/test-helpers/test-helpers.ts index a5f0787a09..5547d889e0 100644 --- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts +++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts @@ -115,6 +115,8 @@ export const mockTagParts = { patch: 1, } as CalverTagParts; +export const mockCtaMessage = 'Patch Release Candidate'; + export const mockBumpedTag = 'rc-2020.01.01_1337'; /** From b85010a0c8394880f868dd3b4c2b55c85f5f0d08 Mon Sep 17 00:00:00 2001 From: Erik Engervall Date: Thu, 13 Jan 2022 14:25:03 +0100 Subject: [PATCH 4/4] Update api-report.md Signed-off-by: Erik Engervall --- plugins/git-release-manager/api-report.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/git-release-manager/api-report.md b/plugins/git-release-manager/api-report.md index 4ed142ca04..743ea4e0f9 100644 --- a/plugins/git-release-manager/api-report.md +++ b/plugins/git-release-manager/api-report.md @@ -296,6 +296,11 @@ const mockBumpedTag = 'rc-2020.01.01_1337'; // @public (undocumented) const mockCalverProject: Project; +// Warning: (ae-missing-release-tag) "mockCtaMessage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +const mockCtaMessage = 'Patch Release Candidate'; + // Warning: (ae-missing-release-tag) "mockDefaultBranch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public (undocumented) @@ -601,6 +606,7 @@ declare namespace testHelpers_2 { mockNextGitInfoSemver, mockNextGitInfoCalver, mockTagParts, + mockCtaMessage, mockBumpedTag, createMockRelease, mockReleaseCandidateCalver,