Skip to content

Commit 7d10988

Browse files
factor out statusUtils class
1 parent 63a9c52 commit 7d10988

File tree

5 files changed

+12
-100
lines changed

5 files changed

+12
-100
lines changed

web/renderer/components/pageComponents/DatabasePage/ForTests/TestList/TestItemRenderer.tsx

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import TestItem from "@pageComponents/DatabasePage/ForTests/TestItem";
2-
import { getTestStatusColors, getStatusClassName } from "./statusUtils";
32
import css from "./index.module.css";
43
import { Test } from "@gen/graphql-types";
54

@@ -17,7 +16,7 @@ type Props = {
1716
onNameEdit: (testName: string, name: string) => void;
1817
onNameBlur: (testName: string) => void;
1918
onRunTest: (testName: string) => Promise<void>;
20-
onDeleteTest: (testName: string) => Promise<void>;
19+
onDeleteTest: (testName: string) => void;
2120
};
2221

2322
export default function TestItemRenderer({
@@ -36,15 +35,6 @@ export default function TestItemRenderer({
3635
return (
3736
<>
3837
{tests.map(test => {
39-
const testStatusColors = getTestStatusColors(
40-
testResults[test.testName],
41-
);
42-
const statusClassName = getStatusClassName(testStatusColors, {
43-
green: css.greenTest,
44-
red: css.redTest,
45-
orange: css.orangeTest,
46-
});
47-
4838
return (
4939
<TestItem
5040
key={test.testName}
@@ -53,15 +43,14 @@ export default function TestItemRenderer({
5343
isExpanded={expandedItems.has(test.testName)}
5444
editingName={editingTestNames[test.testName]}
5545
testResult={testResults[test.testName]}
56-
className={statusClassName}
5746
onToggleExpanded={() => onToggleExpanded(test.testName)}
5847
onUpdateTest={(field, value) =>
5948
onUpdateTest(test.testName, field, value)
6049
}
6150
onNameEdit={name => onNameEdit(test.testName, name)}
6251
onNameBlur={() => onNameBlur(test.testName)}
6352
onRunTest={async () => await onRunTest(test.testName)}
64-
onDeleteTest={async () => await onDeleteTest(test.testName)}
53+
onDeleteTest={() => onDeleteTest(test.testName)}
6554
/>
6655
);
6756
})}

web/renderer/components/pageComponents/DatabasePage/ForTests/TestList/index.module.css

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -203,17 +203,6 @@
203203
@apply mb-4;
204204
}
205205

206-
.greenGroup {
207-
@apply border-l-green-400 text-green-400;
208-
}
209-
210-
.redGroup {
211-
@apply border-l-red-400 text-red-400;
212-
}
213-
214-
.orangeGroup {
215-
@apply text-orange-500;
216-
}
217206

218207
.runAllButton {
219208
@apply bg-green-600 text-white;

web/renderer/components/pageComponents/DatabasePage/ForTests/TestList/index.tsx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { useTestList } from "./useTestList";
88
import { RefParams } from "@lib/params";
99
import CreateDropdown from "./CreateDropdown";
1010
import TestItemRenderer from "./TestItemRenderer";
11-
import { getGroupStatusColors, getStatusClassName } from "./statusUtils";
1211
import Link from "@components/links/Link";
1312
import { workingDiff } from "@lib/urls";
1413

@@ -101,23 +100,13 @@ export default function TestList({ params }: Props) {
101100
.filter(([groupName]) => groupName !== "")
102101
.map(([groupName, groupTests]) => {
103102
const isGroupExpanded = expandedGroups.has(groupName);
104-
const groupStatusColors = getGroupStatusColors(
105-
groupTests,
106-
testResults,
107-
);
108-
109103
return (
110104
<div key={groupName} className={css.groupedTests}>
111105
<TestGroup
112106
group={groupName}
113107
isExpanded={isGroupExpanded}
114108
onToggle={() => toggleGroupExpanded(groupName)}
115109
testCount={groupTests.length}
116-
className={getStatusClassName(groupStatusColors, {
117-
green: css.greenGroup,
118-
red: css.redGroup,
119-
orange: css.orangeGroup,
120-
})}
121110
groupResult={getGroupResult(groupName)}
122111
onRunGroup={async () => await handleRunGroup(groupName)}
123112
onDeleteGroup={async () => handleDeleteGroup(groupName)}

web/renderer/components/pageComponents/DatabasePage/ForTests/TestList/statusUtils.ts

Lines changed: 0 additions & 53 deletions
This file was deleted.

web/renderer/components/pageComponents/DatabasePage/ForTests/TestList/useTestList.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export function useTestList(params: RefParams) {
104104
},
105105
});
106106

107-
const testResultsList = result.data?.runTests.list || [];
107+
const testResultsList = result.data?.runTests.list ?? [];
108108
const allResults = getResults(testResultsList);
109109

110110
setTestResults(allResults);
@@ -125,25 +125,25 @@ export function useTestList(params: RefParams) {
125125
data?.tests.list,
126126
]);
127127

128-
const toggleExpanded = (id: string) => {
128+
const toggleExpanded = useCallback((testName: string) => {
129129
const newExpanded = new Set(expandedItems);
130-
if (newExpanded.has(id)) {
131-
newExpanded.delete(id);
130+
if (newExpanded.has(testName)) {
131+
newExpanded.delete(testName);
132132
} else {
133-
newExpanded.add(id);
133+
newExpanded.add(testName);
134134
}
135135
setExpandedItems(newExpanded);
136-
};
136+
}, [expandedItems]);
137137

138-
const toggleGroupExpanded = (groupName: string) => {
138+
const toggleGroupExpanded = useCallback((groupName: string) => {
139139
const newExpandedGroups = new Set(expandedGroups);
140140
if (newExpandedGroups.has(groupName)) {
141141
newExpandedGroups.delete(groupName);
142142
} else {
143143
newExpandedGroups.add(groupName);
144144
}
145145
setExpandedGroups(newExpandedGroups);
146-
};
146+
}, [expandedGroups]);
147147

148148
const updateTest = (name: string, field: keyof Test, value: string) => {
149149
setTests(
@@ -237,7 +237,7 @@ export function useTestList(params: RefParams) {
237237
});
238238
};
239239

240-
const handleDeleteTest = async (testName: string) => {
240+
const handleDeleteTest = (testName: string) => {
241241
setTests(tests.filter(test => test.testName !== testName));
242242
setExpandedItems(prev => {
243243
const newSet = new Set(prev);
@@ -247,7 +247,7 @@ export function useTestList(params: RefParams) {
247247
setHasUnsavedChanges(true);
248248
};
249249

250-
const handleDeleteGroup = async (groupName: string) => {
250+
const handleDeleteGroup = (groupName: string) => {
251251
setTests(tests.filter(test => test.testGroup !== groupName));
252252
setExpandedGroups(prev => {
253253
const newSet = new Set(prev);
@@ -472,7 +472,6 @@ export function useTestList(params: RefParams) {
472472
expandedItems,
473473
expandedGroups,
474474
editingTestNames,
475-
hasUnsavedChanges,
476475
tests,
477476
groupedTests,
478477
sortedGroupEntries,
@@ -488,7 +487,6 @@ export function useTestList(params: RefParams) {
488487
handleDeleteGroup,
489488
handleCreateGroup,
490489
handleCreateTest,
491-
handleSaveAll,
492490
handleRenameGroup,
493491
handleTestNameEdit,
494492
handleTestNameBlur,

0 commit comments

Comments
 (0)