Skip to content

Commit 2264ac5

Browse files
howard-ehoward-e
committed
Merge branch 'main' into support-v2-test-format
# Conflicts: # client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
2 parents ab9a597 + 477abcb commit 2264ac5

File tree

31 files changed

+430
-1003
lines changed

31 files changed

+430
-1003
lines changed

‎client/components/App/App.jsx

+8-3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,14 @@ const App = () => {
7474
<Nav.Link
7575
as={Link}
7676
to="/data-management"
77-
aria-current={location.pathname.startsWith(
78-
'/data-management'
79-
)}
77+
aria-current={
78+
location.pathname.startsWith(
79+
'/data-management'
80+
) ||
81+
location.pathname.startsWith(
82+
'/test-review'
83+
)
84+
}
8085
>
8186
Data Management
8287
</Nav.Link>

‎client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx

+10-17
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@ import { evaluateAtNameKey } from '../../../utils/aria.js';
1717
import commandsJson from '../../../resources/commands.json';
1818
import supportJson from '../../../resources/support.json';
1919

20-
const Container = styled.div`
21-
padding: 20px;
22-
`;
23-
24-
const Heading = styled.h2`
25-
margin: 0 0 0.5em 0;
26-
`;
27-
2820
const NumberedList = styled.ol`
2921
counter-reset: numbered-list;
3022
list-style: none;
@@ -53,12 +45,12 @@ const NumberedList = styled.ol`
5345
`;
5446

5547
const InstructionsRenderer = ({
56-
testResult,
48+
test,
5749
testPageUrl,
5850
at,
59-
testFormatVersion = 1
51+
headingLevel = 2,
52+
testFormatVersion
6053
}) => {
61-
const { test = {} } = testResult;
6254
const { renderableContent } = test;
6355
const [testRunExport, setTestRunExport] = useState();
6456
const [pageContent, setPageContent] = useState({
@@ -171,8 +163,10 @@ const InstructionsRenderer = ({
171163
const assertions = [...pageContent.instructions.assertions.assertions];
172164
const assertionsContent = parseListContent(assertions);
173165

166+
const Heading = `h${headingLevel}`;
167+
174168
return (
175-
<Container>
169+
<>
176170
<NumberedList>{allInstructionsContent}</NumberedList>
177171
<Heading>{pageContent.instructions.assertions.header}</Heading>
178172
{pageContent.instructions.assertions.description}
@@ -183,19 +177,18 @@ const InstructionsRenderer = ({
183177
>
184178
{pageContent.instructions.openTestPage.button}
185179
</Button>
186-
</Container>
180+
</>
187181
);
188182
};
189183

190184
InstructionsRenderer.propTypes = {
191-
testResult: PropTypes.shape({
192-
test: PropTypes.object.isRequired
193-
}),
185+
test: PropTypes.object.isRequired,
194186
testPageUrl: PropTypes.string,
195187
at: PropTypes.shape({
196188
name: PropTypes.string.isRequired
197189
}),
198-
testFormatVersion: PropTypes.number
190+
testFormatVersion: PropTypes.number,
191+
headingLevel: PropTypes.number
199192
};
200193

201194
export default InstructionsRenderer;

‎client/components/CandidateReview/CandidateTestPlanRun/index.jsx

+1-5
Original file line numberDiff line numberDiff line change
@@ -496,11 +496,7 @@ const CandidateTestPlanRun = () => {
496496
<InstructionsRenderer
497497
key={`instructions-${currentTest.id}`}
498498
at={testPlanReport.at}
499-
testResult={{
500-
scenarioResults: {},
501-
test: currentTest,
502-
completedAt: new Date()
503-
}}
499+
test={currentTest}
504500
testPageUrl={testPlanReport.testPlanVersion.testPageUrl}
505501
testFormatVersion={
506502
testPlanVersion.metadata.testFormatVersion

‎client/components/DataManagement/DataManagementRow/index.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ const DataManagementRow = ({
553553
<VersionString
554554
role="listitem"
555555
iconColor="#2BA51C"
556-
linkHref={`/test-review/${latestVersion.gitSha}/${latestVersion.testPlan.directory}`}
556+
linkHref={`/test-review/${latestVersion.id}`}
557557
>
558558
{latestVersion.versionString}
559559
</VersionString>
@@ -682,7 +682,7 @@ const DataManagementRow = ({
682682
role="listitem"
683683
iconColor="#2BA51C"
684684
linkRef={draftVersionStringRef}
685-
linkHref={`/test-review/${latestVersion.gitSha}/${latestVersion.testPlan.directory}`}
685+
linkHref={`/test-review/${latestVersion.id}`}
686686
>
687687
{latestVersion.versionString}
688688
</VersionString>
@@ -889,7 +889,7 @@ const DataManagementRow = ({
889889
role="listitem"
890890
iconColor="#2BA51C"
891891
linkRef={candidateVersionStringRef}
892-
linkHref={`/test-review/${latestVersion.gitSha}/${latestVersion.testPlan.directory}`}
892+
linkHref={`/test-review/${latestVersion.id}`}
893893
>
894894
{latestVersion.versionString}
895895
</VersionString>
@@ -1004,7 +1004,7 @@ const DataManagementRow = ({
10041004
role="listitem"
10051005
iconColor="#2BA51C"
10061006
linkRef={recommendedVersionStringRef}
1007-
linkHref={`/test-review/${latestVersion.gitSha}/${latestVersion.testPlan.directory}`}
1007+
linkHref={`/test-review/${latestVersion.id}`}
10081008
>
10091009
{latestVersion.versionString}
10101010
</VersionString>

‎client/components/DataManagement/index.jsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,9 @@ const DataManagement = () => {
144144

145145
<h2>Test Plans Status Summary</h2>
146146
<FilterButtons
147-
filterOptions={DATA_MANAGEMENT_TABLE_FILTER_OPTIONS}
148-
optionLabels={filterLabels}
147+
filterLabel="Filter"
148+
filterAriaLabel="Filter tests plans by status"
149+
filterOptions={filterLabels}
149150
activeFilter={filter}
150151
onFilterChange={setFilter}
151152
/>

‎client/components/Reports/SummarizeTestPlanReport.jsx

+1-5
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,7 @@ const SummarizeTestPlanReport = ({ testPlanVersion, testPlanReports }) => {
145145
<ul>
146146
<li>
147147
Generated from&nbsp;
148-
<a
149-
href={`/test-review/${testPlanVersion.gitSha}/${testPlanVersion.testPlan.directory}`}
150-
target="_blank"
151-
rel="noreferrer"
152-
>
148+
<a href={`/test-review/${testPlanVersion.id}`}>
153149
{testPlanVersion.versionString} of{' '}
154150
{testPlanVersion.title} Test Plan
155151
</a>

‎client/components/Reports/SummarizeTestPlanVersion.jsx

+1-5
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ const SummarizeTestPlanVersion = ({ testPlanVersion, testPlanReports }) => {
5454
<ul>
5555
<li>
5656
Generated from&nbsp;
57-
<a
58-
href={`/test-review/${testPlanVersion.gitSha}/${testPlanVersion.testPlan.directory}`}
59-
target="_blank"
60-
rel="noreferrer"
61-
>
57+
<a href={`/test-review/${testPlanVersion.id}`}>
6258
{testPlanVersion.versionString} of{' '}
6359
{testPlanVersion.title} Test Plan
6460
</a>

‎client/components/TestPlanVersionsPage/index.jsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ const TestPlanVersionsPage = () => {
409409
testPlanVersion
410410
)}
411411
autoWidth={false}
412+
linkHref={`/test-review/${testPlanVersion.id}`}
412413
>
413414
{testPlanVersion.versionString}
414415
</VersionString>
@@ -674,9 +675,7 @@ const TestPlanVersionsPage = () => {
674675
</li>
675676
<li>
676677
<a
677-
target="_blank"
678-
rel="noreferrer"
679-
href={`/test-review/${testPlanVersion.gitSha}/${testPlanDirectory}`}
678+
href={`/test-review/${testPlanVersion.id}`}
680679
>
681680
<FontAwesomeIcon
682681
icon={

0 commit comments

Comments
 (0)