Use testPlanVersion.metadata.testFormatVersion

w3c · Nov 21, 2023 · cd1cdc9 · cd1cdc9
1 parent c0ba18e
commit cd1cdc9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
@@ -52,7 +52,12 @@ const NumberedList = styled.ol`
     }
 `;
 
-const InstructionsRenderer = ({ testResult, testPageUrl, at }) => {
+const InstructionsRenderer = ({
+    testResult,
+    testPageUrl,
+    at,
+    testFormatVersion = 1
+}) => {
     const { test = {} } = testResult;
     const { renderableContent } = test;
     const [testRunExport, setTestRunExport] = useState();
@@ -122,9 +127,7 @@ const InstructionsRenderer = ({ testResult, testPageUrl, at }) => {
     }, [testRunExport]);
 
     let allInstructions;
-    const isV2 =
-        !!renderableContent.target.at?.raw
-            ?.defaultConfigurationInstructionsHTML;
+    const isV2 = testFormatVersion === 2;
 
     if (isV2) {
         const commandSettingSpecified = renderableContent.commands.some(
@@ -185,7 +188,8 @@ InstructionsRenderer.propTypes = {
     testPageUrl: PropTypes.string,
     at: PropTypes.shape({
         name: PropTypes.string.isRequired
-    })
+    }),
+    testFormatVersion: PropTypes.number
 };
 
 export default InstructionsRenderer;
diff --git a/client/components/CandidateReview/CandidateTestPlanRun/index.jsx b/client/components/CandidateReview/CandidateTestPlanRun/index.jsx
@@ -502,6 +502,9 @@ const CandidateTestPlanRun = () => {
                             completedAt: new Date()
                         }}
                         testPageUrl={testPlanReport.testPlanVersion.testPageUrl}
+                        testFormatVersion={
+                            testPlanVersion.metadata.testFormatVersion
+                        }
                     />,
                     ...testPlanReports.map(testPlanReport => {
                         const testResult =

diff --git a/client/components/TestRenderer/index.jsx b/client/components/TestRenderer/index.jsx
@@ -212,6 +212,7 @@ const TestRenderer = ({
     at,
     testResult = {},
     testPageUrl,
+    testFormatVersion = 1,
     testRunStateRef,
     recentTestRunStateRef,
     testRunResultRef,
@@ -481,9 +482,7 @@ const TestRenderer = ({
 
     const InstructionsContent = ({ labelIdRef }) => {
         let allInstructions;
-        const isV2 =
-            !!renderableContent.target.at?.raw
-                ?.defaultConfigurationInstructionsHTML;
+        const isV2 = testFormatVersion === 2;
         let settingsContent = [];
 
         if (isV2) {
@@ -1080,6 +1079,7 @@ TestRenderer.propTypes = {
     testResult: PropTypes.object,
     support: PropTypes.object,
     testPageUrl: PropTypes.string,
+    testFormatVersion: PropTypes.number,
     testRunStateRef: PropTypes.any,
     recentTestRunStateRef: PropTypes.any,
     testRunResultRef: PropTypes.any,

diff --git a/client/components/TestRun/index.jsx b/client/components/TestRun/index.jsx
@@ -1011,6 +1011,10 @@ const TestRun = () => {
                                               )
                                     }
                                     testPageUrl={testPlanVersion.testPageUrl}
+                                    testFormatVersion={
+                                        testPlanVersion.metadata
+                                            .testFormatVersion
+                                    }
                                     testRunStateRef={testRunStateRef}
                                     recentTestRunStateRef={
                                         recentTestRunStateRef

diff --git a/client/components/TestRun/queries.js b/client/components/TestRun/queries.js
@@ -142,6 +142,7 @@ export const TEST_RUN_PAGE_QUERY = gql`
                     testPlan {
                         directory
                     }
+                    metadata
                 }
                 runnableTests {
                     id
@@ -252,6 +253,7 @@ export const TEST_RUN_PAGE_ANON_QUERY = gql`
                 testPlan {
                     directory
                 }
+                metadata
             }
             runnableTests {
                 id
@@ -441,6 +443,7 @@ export const FIND_OR_CREATE_TEST_RESULT_MUTATION = gql`
                             testPlan {
                                 directory
                             }
+                            metadata
                         }
                         runnableTests {
                             id
@@ -536,6 +539,7 @@ export const FIND_OR_CREATE_TEST_RESULT_MUTATION = gql`
                         testPlan {
                             directory
                         }
+                        metadata
                     }
                     runnableTests {
                         id
@@ -729,6 +733,7 @@ export const SAVE_TEST_RESULT_MUTATION = gql`
                             testPlan {
                                 directory
                             }
+                            metadata
                         }
                         runnableTests {
                             id
@@ -824,6 +829,7 @@ export const SAVE_TEST_RESULT_MUTATION = gql`
                         testPlan {
                             directory
                         }
+                        metadata
                     }
                     runnableTests {
                         id
@@ -1017,6 +1023,7 @@ export const SUBMIT_TEST_RESULT_MUTATION = gql`
                             testPlan {
                                 directory
                             }
+                            metadata
                         }
                         runnableTests {
                             id
@@ -1112,6 +1119,7 @@ export const SUBMIT_TEST_RESULT_MUTATION = gql`
                         testPlan {
                             directory
                         }
+                        metadata
                     }
                     runnableTests {
                         id