Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecated phase copy #781

Merged
merged 3 commits into from
Sep 21, 2023
Merged

Deprecated phase copy #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b45419e
Update deprecated phase copy
alflennik Sep 20, 2023
f877628
Remove unneeded change
alflennik Sep 20, 2023
9095b03
Fix spacing in copy
alflennik Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 39 additions & 2 deletions client/components/TestPlanVersionsPage/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,47 @@ const TestPlanVersionsPage = () => {
</PhasePill>
);

const draftPill = (
<PhasePill
fullWidth={false}
>
DRAFT
</PhasePill>
);

if (
derivedDeprecatedAtPhase ===
'RD'
) {
return (
<>
howard-e marked this conversation as resolved.
Show resolved Hide resolved
{deprecatedPill}
{` before `}
{draftPill}
{` review `}
</>
);
}

if (
derivedDeprecatedAtPhase ===
'RECOMMENDED'
) {
return (
<>
{deprecatedPill}
howard-e marked this conversation as resolved.
Show resolved Hide resolved
{` after being approved as `}
{phasePill}
</>
);
}

return (
<>
{deprecatedPill} during{' '}
{phasePill} review
{deprecatedPill}
howard-e marked this conversation as resolved.
Show resolved Hide resolved
{` during `}
{phasePill}
{` review `}
</>
);
}
Expand Down
4 changes: 2 additions & 2 deletions client/components/common/PhasePill/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const PhaseText = styled.span`
padding: 2px 15px;
vertical-align: middle;
position: relative;
top: -1px;
margin-right: 5px;
top: -4px;
margin-top: 4px; /* Improve appearance when text wraps */
}

&.rd {
Expand Down
1 change: 1 addition & 0 deletions client/components/common/ThemeTable/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export const ThemeTable = styled(Table)`
th {
padding-left: 1rem;
min-width: 165px;
vertical-align: middle;
}
`;

Expand Down