Skip to content

Commit 6b71449

Browse files
cheungrowanRowan Cheung
and
Rowan Cheung
authored
update compare table columns for no reference (#116)
Co-authored-by: Rowan Cheung <[email protected]>
1 parent dbf6fa1 commit 6b71449

File tree

5 files changed

+27
-15
lines changed

5 files changed

+27
-15
lines changed

arthur_bench/server/js/package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"private": true,
55
"overrides": {
66
"@babel/preset-typescript": "7.21.4",
7-
"@types/react": "18.0.17",
8-
"@types/react-dom": "18.0.6",
7+
"@types/react": "^18.0.17",
8+
"@types/react-dom": "^18.0.6",
99
"react": "18.2.0",
1010
"react-dom": "18.2.0",
1111
"react-fela": "12.2.0",
@@ -30,8 +30,8 @@
3030
"react-redux": "8.0.2",
3131
"react-router-dom": "6.3.0",
3232
"resources": "file:packages/resources",
33-
"tsconfig": "file:packages/tsconfig",
3433
"ts-node": "10.9.1",
34+
"tsconfig": "file:packages/tsconfig",
3535
"ui": "file:packages/components",
3636
"utils": "file:packages/utils"
3737
},
@@ -40,8 +40,7 @@
4040
},
4141
"devDependencies": {
4242
"@babel/core": "7.20.2",
43-
"@types/react": "18.0.17",
44-
"@types/react-dom": "18.0.6",
43+
"html-webpack-plugin": "^5.6.0",
4544
"ts-loader": "9.3.1",
4645
"webpack": "^5.73.0",
4746
"webpack-cli": "^5.1.4"

arthur_bench/server/js/packages/components/compound/TestRunDeepDive/CompareTable.tsx

+16-3
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,24 @@ const CompareTable = () => {
6262
pagination: state.testSuites.currentTestRun?.pagination,
6363
runs: state.testSuites.currentTestRun?.data,
6464
}));
65-
const data = formatTestRunData(runs);
66-
const columns = runs?.map((run: TTestRunData) => run.name);
6765

6866
useEffect(() => {
6967
testSuiteId && testRunIdsArray && fetchMultipleTestRunDetails(testSuiteId, testRunIdsArray, page, 5);
7068
}, [page]);
7169

70+
const data = formatTestRunData(runs);
71+
const columns = runs?.map((run: TTestRunData) => run.name);
72+
73+
const { hasReference } = (data || []).reduce(
74+
(acc, data) => {
75+
if (data.referenceOutput) {
76+
acc.hasReference = true;
77+
}
78+
return acc;
79+
},
80+
{ hasReference: false }
81+
);
82+
7283
const setNewPage = useCallback(
7384
(propsPage: number) => {
7485
const newPage = propsPage + 1;
@@ -87,7 +98,9 @@ const CompareTable = () => {
8798
<Table className={css(styles.table)}>
8899
<TableHeader>
89100
<TableCell className={css(styles.headerCell(primary.white))}>{t("testSuite.inputPrompts")}</TableCell>
90-
<TableCell className={css(styles.headerCell(primary.white))}>{t("testSuite.referenceOutputs")}</TableCell>
101+
{hasReference && (
102+
<TableCell className={css(styles.headerCell(primary.white))}>{t("testSuite.referenceOutputs")}</TableCell>
103+
)}
91104
{columns.map((column: string) => (
92105
<TableCell className={css(styles.headerCell(primary.white))}>{column}</TableCell>
93106
))}

arthur_bench/server/js/packages/components/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
"@storybook/react": "^6.5.9",
2222
"@storybook/testing-library": "^0.0.13",
2323
"@types/lodash.merge": "^4.6.7",
24-
"@types/react": "18.0.17",
24+
"@types/react": "^18.0.17",
2525
"@types/react-datepicker": "^4.4.2",
26-
"@types/react-dom": "18.0.6",
26+
"@types/react-dom": "^18.0.6",
2727
"@types/uuid": "^8.3.4",
2828
"babel-loader": "^8.2.5",
2929
"eslint": "^8.18.0",

arthur_bench/server/js/src/Bench/CompareTestRuns.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect } from "react";
1+
import React, { useEffect, ReactElement } from "react";
22
import SummaryVisualizations from "@compound/SummaryVisualizations/SummaryVisualizations";
33
import CompareTable from "@compound/TestRunDeepDive/CompareTable";
44
import TestSuiteHeader from "../Bench/TestSuiteHeader";
@@ -18,10 +18,10 @@ const CompareTestRuns = () => {
1818

1919
useEffect(() => {
2020
if (testSuiteId) {
21-
fetchTestSuiteData(testSuiteId);
21+
fetchTestSuiteData(testSuiteId, 1 , 5);
2222
fetchTestRunSummary(testSuiteId, testRunIdsArray);
2323
}
24-
}, []);
24+
}, [testSuiteId]);
2525

2626
const data = useSelector((state: State) => state.testSuites?.currentTestSuite?.data?.data);
2727

arthur_bench/server/js/src/Bench/TestRun.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ const TestRun = () => {
2727
useEffect(() => {
2828
if (testSuiteId && testRunId) {
2929
fetchTestRunDetail(testSuiteId, testRunId, 1, 10, sort);
30-
fetchTestSuiteData(testSuiteId);
30+
fetchTestSuiteData(testSuiteId, 1, 5);
3131
fetchTestRunSummary(testSuiteId);
3232
fetchTestRunSummary(testSuiteId, [testRunId]);
3333
}
34-
}, []);
34+
}, [testSuiteId]);
3535

3636
const { currentTestRun, name } = useSelector((state: State) => ({
3737
currentTestRun: state.testSuites.currentTestRun?.data,

0 commit comments

Comments
 (0)