Skip to content

Commit 5c46682

Browse files
eric-richardson1eric-richardson1
committed
run prettier
1 parent f544e7c commit 5c46682

File tree

11 files changed

+265
-190
lines changed

11 files changed

+265
-190
lines changed

‎graphql-server/src/queryFactory/dolt/index.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,11 +595,16 @@ export class DoltQueryFactory
595595
}
596596

597597
async runTests(args: t.RunTestsArgs): t.PR {
598-
const withTestIdentifierArg = args.testIdentifier && (args.testIdentifier.testName !== undefined || args.testIdentifier.groupName !== undefined);
598+
const withTestIdentifierArg =
599+
args.testIdentifier &&
600+
(args.testIdentifier.testName !== undefined ||
601+
args.testIdentifier.groupName !== undefined);
599602

600603
return this.query(
601604
qh.doltTestRun(withTestIdentifierArg),
602-
withTestIdentifierArg ? [args.testIdentifier?.testName ?? args.testIdentifier?.groupName] : undefined,
605+
withTestIdentifierArg
606+
? [args.testIdentifier?.testName ?? args.testIdentifier?.groupName]
607+
: undefined,
603608
args.databaseName,
604609
args.refName,
605610
);

‎graphql-server/src/queryFactory/doltgres/index.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -569,16 +569,19 @@ export class DoltgresQueryFactory
569569
}
570570

571571
async runTests(args: t.RunTestsArgs): t.PR {
572-
const withTestIdentifierArg = args.testIdentifier && (args.testIdentifier.testName !== undefined || args.testIdentifier.groupName !== undefined);
572+
const withTestIdentifierArg =
573+
args.testIdentifier &&
574+
(args.testIdentifier.testName !== undefined ||
575+
args.testIdentifier.groupName !== undefined);
573576

574577
return this.query(
575578
qh.doltTestRun(withTestIdentifierArg),
576-
withTestIdentifierArg ? [args.testIdentifier?.testName ?? args.testIdentifier?.groupName] : undefined,
579+
withTestIdentifierArg
580+
? [args.testIdentifier?.testName ?? args.testIdentifier?.groupName]
581+
: undefined,
577582
args.databaseName,
578583
args.refName,
579584
);
580-
581-
582585
}
583586

584587
async saveTests(args: t.SaveTestsArgs): Promise<InsertResult> {

‎graphql-server/src/tests/test.model.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,11 @@ export class TestResultList {
7171
list: TestResult[];
7272
}
7373

74-
export function fromDoltTestRowRes(databaseName: string, refName: string, test: RawRow | ObjectLiteral): Test {
74+
export function fromDoltTestRowRes(
75+
databaseName: string,
76+
refName: string,
77+
test: RawRow | ObjectLiteral,
78+
): Test {
7579
return {
7680
_id: `databases/${databaseName}/refs/${refName}/tests/${test.test_name}`,
7781
databaseName: databaseName,
@@ -85,7 +89,11 @@ export function fromDoltTestRowRes(databaseName: string, refName: string, test:
8589
};
8690
}
8791

88-
export function fromDoltTestResultRowRes(databaseName: string, refName: string, testResult: RawRow): TestResult {
92+
export function fromDoltTestResultRowRes(
93+
databaseName: string,
94+
refName: string,
95+
testResult: RawRow,
96+
): TestResult {
8997
return {
9098
_id: `databases/${databaseName}/refs/${refName}/testResults/${testResult.test_name}`,
9199
databaseName: databaseName,

‎graphql-server/src/tests/test.resolver.ts‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import {
1919

2020
@InputType()
2121
class TestArgs {
22-
2322
@Field()
2423
@Field()
2524
testName: string;
@@ -76,7 +75,9 @@ export class TestResolver {
7675
const conn = this.conn.connection();
7776
const res = await conn.getTests(args);
7877
return {
79-
list: res.map(t => fromDoltTestRowRes(args.databaseName, args.refName, t)),
78+
list: res.map(t =>
79+
fromDoltTestRowRes(args.databaseName, args.refName, t),
80+
),
8081
};
8182
}
8283

@@ -85,7 +86,9 @@ export class TestResolver {
8586
const conn = this.conn.connection();
8687
const res = await conn.runTests(args);
8788
return {
88-
list: res.map(t => fromDoltTestResultRowRes(args.databaseName, args.refName, t)),
89+
list: res.map(t =>
90+
fromDoltTestResultRowRes(args.databaseName, args.refName, t),
91+
),
8992
};
9093
}
9194

@@ -94,7 +97,9 @@ export class TestResolver {
9497
const conn = this.conn.connection();
9598
const res = await conn.saveTests(args);
9699
return {
97-
list: res.generatedMaps.map(t => fromDoltTestRowRes(args.databaseName, args.refName, t)),
100+
list: res.generatedMaps.map(t =>
101+
fromDoltTestRowRes(args.databaseName, args.refName, t),
102+
),
98103
};
99104
}
100105
}

‎web/renderer/components/pageComponents/DatabasePage/ForPulls/PullActions/Merge/index.tsx‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import ResolveModal from "./ResolveModal";
2727
import css from "./index.module.css";
2828
import useMergeButton, { MergeButtonState } from "./useMergeButton";
2929

30-
3130
type Props = {
3231
params: PullDiffParams;
3332
pullDetails: PullDetailsFragment;
@@ -172,11 +171,11 @@ type TestStatusColors = {
172171
};
173172

174173
function TestResultsTitle({
175-
red,
176-
green,
177-
orange,
178-
onRunTests,
179-
}: TestStatusColors & { onRunTests: () => void }) {
174+
red,
175+
green,
176+
orange,
177+
onRunTests,
178+
}: TestStatusColors & { onRunTests: () => void }) {
180179
return (
181180
<>
182181
<div className={css.testResultsTitleSection}>
@@ -203,11 +202,11 @@ function TestResultsTitle({
203202
}
204203

205204
function TestResultsIconSwitch({
206-
red,
207-
green,
208-
orange,
209-
className,
210-
}: TestStatusColors & { className?: string }) {
205+
red,
206+
green,
207+
orange,
208+
className,
209+
}: TestStatusColors & { className?: string }) {
211210
if (red) return <FiX className={className} />;
212211
if (orange) return <FiCircle className={className} />;
213212
if (green) return <FiCheck className={className} />;
@@ -217,9 +216,13 @@ function TestResultsIconSwitch({
217216
function TestTitle({ test }: { test: TestResult }) {
218217
return (
219218
<div className={css.testResultsTestTitle}>
220-
<span className={css.testResultsTestName}>{excerpt(test.testName, 50)}</span>
219+
<span className={css.testResultsTestName}>
220+
{excerpt(test.testName, 50)}
221+
</span>
221222
{test.message && (
222-
<span className={css.testResultsTestMessage}>{excerpt(test.message, 100)}</span>
223+
<span className={css.testResultsTestMessage}>
224+
{excerpt(test.message, 100)}
225+
</span>
223226
)}
224227
</div>
225228
);
@@ -232,7 +235,13 @@ function TestResultsListItemIconSwitch({ test }: { test: TestResult }) {
232235
return <FiX className={css.testResultsFailureIcon} />;
233236
}
234237

235-
function TestResultsListItem({ test, params }: { test: TestResult; params: RefParams }) {
238+
function TestResultsListItem({
239+
test,
240+
params,
241+
}: {
242+
test: TestResult;
243+
params: RefParams;
244+
}) {
236245
const isSuccess = test.status === "PASS";
237246
const isFailure = !isSuccess;
238247

@@ -242,10 +251,14 @@ function TestResultsListItem({ test, params }: { test: TestResult; params: RefPa
242251
{...testsUrl(params)
243252
.withQuery({ runTests: "true" })
244253
.withHash(encodeURIComponent(test.testName))}
245-
className={cx(css.testResultsItemContainer, css.testResultsLinkContent, {
246-
[css.testResultsRed]: isFailure,
247-
[css.testResultsGreen]: isSuccess,
248-
})}
254+
className={cx(
255+
css.testResultsItemContainer,
256+
css.testResultsLinkContent,
257+
{
258+
[css.testResultsRed]: isFailure,
259+
[css.testResultsGreen]: isSuccess,
260+
},
261+
)}
249262
data-test-name={test.testName}
250263
>
251264
<div className={css.testResultsIcon}>

‎web/renderer/components/pageComponents/DatabasePage/ForTests/TestGroup/index.tsx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ type Props = {
1818
className?: string;
1919
};
2020

21-
export default function TestGroup({
22-
group,
23-
className,
24-
}: Props) {
21+
export default function TestGroup({ group, className }: Props) {
2522
const {
2623
tests,
2724
expandedGroups,
@@ -60,7 +57,7 @@ export default function TestGroup({
6057
hasUnsavedChanges: true,
6158
});
6259
setShowDeleteConfirm(false);
63-
}
60+
};
6461

6562
const handleRenameGroup = (oldName: string, newName: string) => {
6663
if (newName.trim() && oldName !== newName.trim()) {

‎web/renderer/components/pageComponents/DatabasePage/ForTests/TestItem/index.tsx‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ type Props = {
1717
className?: string;
1818
};
1919

20-
export default function TestItem({
21-
test,
22-
className,
23-
}: Props) {
20+
export default function TestItem({ test, className }: Props) {
2421
const {
2522
expandedItems,
2623
editingTestNames,
@@ -38,14 +35,17 @@ export default function TestItem({
3835
);
3936
const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
4037

41-
const updateTest = useCallback((name: string, field: keyof Test, value: string) => {
42-
setState({
43-
tests: tests.map((test: Test) =>
44-
test.testName === name ? { ...test, [field]: value } : test,
45-
),
46-
hasUnsavedChanges: true,
47-
});
48-
}, [tests, setState]);
38+
const updateTest = useCallback(
39+
(name: string, field: keyof Test, value: string) => {
40+
setState({
41+
tests: tests.map((test: Test) =>
42+
test.testName === name ? { ...test, [field]: value } : test,
43+
),
44+
hasUnsavedChanges: true,
45+
});
46+
},
47+
[tests, setState],
48+
);
4949

5050
const handleDeleteTest = (testName: string) => {
5151
const newExpandedItems = new Set(expandedItems);
@@ -75,7 +75,7 @@ export default function TestItem({
7575
const newEditingTestNames = { ...editingTestNames };
7676
delete newEditingTestNames[testName];
7777
setState({ editingTestNames: newEditingTestNames });
78-
}
78+
};
7979

8080
const groupOptions = sortedGroupEntries
8181
.map(entry => entry[0])
@@ -84,16 +84,14 @@ export default function TestItem({
8484
const editingName = editingTestNames[test.testName];
8585
const testResult = testResults[test.testName];
8686

87-
const debouncedOnUpdateTest = (
88-
(field: keyof Test, value: string) => {
89-
if (debounceRef.current) {
90-
clearTimeout(debounceRef.current);
91-
}
92-
debounceRef.current = setTimeout(() => {
93-
updateTest(test.testName, field, value);
94-
}, 500); // 500ms debounce
87+
const debouncedOnUpdateTest = (field: keyof Test, value: string) => {
88+
if (debounceRef.current) {
89+
clearTimeout(debounceRef.current);
9590
}
96-
);
91+
debounceRef.current = setTimeout(() => {
92+
updateTest(test.testName, field, value);
93+
}, 500); // 500ms debounce
94+
};
9795

9896
useEffect(
9997
() => () => {
@@ -138,7 +136,10 @@ export default function TestItem({
138136
)}
139137
data-test-name={test.testName}
140138
>
141-
<div className={css.itemTop} onClick={() => toggleExpanded(test.testName)}>
139+
<div
140+
className={css.itemTop}
141+
onClick={() => toggleExpanded(test.testName)}
142+
>
142143
<div className={css.testName}>
143144
<FaChevronRight className={css.expandIcon} />
144145
<input
@@ -217,7 +218,9 @@ export default function TestItem({
217218
}),
218219
]}
219220
val={test.testGroup || ""}
220-
onChangeValue={value => updateTest(test.testName, "testGroup", value || "")}
221+
onChangeValue={value =>
222+
updateTest(test.testName, "testGroup", value || "")
223+
}
221224
/>
222225
</div>
223226
<div className={css.fieldGroup}>

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,8 @@ export default function TestList({ params }: Props) {
6060
}
6161
};
6262

63-
const getTestItems = (testItems: Test[]) => testItems.map(test => (
64-
<TestItem
65-
key={test.testName}
66-
test={test}
67-
/>
68-
))
63+
const getTestItems = (testItems: Test[]) =>
64+
testItems.map(test => <TestItem key={test.testName} test={test} />);
6965
return (
7066
<div className={css.container}>
7167
<div className={css.top}>
@@ -108,9 +104,7 @@ export default function TestList({ params }: Props) {
108104
const isGroupExpanded = expandedGroups.has(groupName);
109105
return (
110106
<div key={groupName} className={css.groupedTests}>
111-
<TestGroup
112-
group={groupName}
113-
/>
107+
<TestGroup group={groupName} />
114108
{isGroupExpanded && (
115109
<ol className={css.groupedList}>
116110
{getTestItems(groupTests)}

0 commit comments

Comments
 (0)