Skip to content

Commit cb75aaf

Browse files
committed
Merge branch 'chore/test-and-perf-experiments' into develop
2 parents bf058cd + be234e6 commit cb75aaf

File tree

6 files changed

+1499
-1166
lines changed

6 files changed

+1499
-1166
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,11 @@ jobs:
3030
- name: Format check
3131
run: pnpm format --check || true
3232

33-
<<<<<<< HEAD
34-
- name: Build
35-
run: pnpm build
36-
37-
- name: Install Playwright Browsers
38-
run: npx playwright install --with-deps
39-
40-
- name: Run unit tests
41-
run: pnpm test
42-
43-
- name: Run Playwright e2e tests
44-
run: pnpm test:e2e
45-
=======
4633
- name: Run unit tests
4734
run: pnpm test
4835

4936
- name: Build
5037
run: pnpm build
5138

5239
- name: Run Playwright e2e tests
53-
run: pnpm e2e
54-
>>>>>>> be234e6 (chore: test and performance experiments (web worker, e2e, UI tweaks))
40+
run: pnpm e2e

components/code-editor.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,6 @@ export default function CodeEditor({
125125
const highlightIds = highlightDecorations.map(d => d.id);
126126
editorRef.current.deltaDecorations(highlightIds, []);
127127
}
128-
// Always clear previous highlight
129-
const model = editorRef.current.getModel();
130-
if (model) {
131-
const allDecorations = model.getAllDecorations();
132-
const highlightDecorations = allDecorations.filter(d => d.options.className === 'editor-highlight-line');
133-
const highlightIds = highlightDecorations.map(d => d.id);
134-
editorRef.current.deltaDecorations(highlightIds, []);
135-
}
136128
if (highlightedLine) {
137129
editorRef.current.deltaDecorations([], [
138130
{
@@ -189,8 +181,9 @@ export default function CodeEditor({
189181
}
190182
/* Style for highlighted line */
191183
.editor-highlight-line {
192-
background-color: rgba(56, 189, 248, 0.25) !important;
193-
border-left: 3px solid #38bdf8 !important;
184+
background-color: rgba(56, 189, 248, 0.5) !important;
185+
border-left: 4px solid #38bdf8 !important;
186+
z-index: 10;
194187
}
195188
`}</style>
196189
<Editor

components/csv-validator.tsx

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,6 @@ export default function CsvValidator() {
255255
if (data.schemas.length > 0) {
256256
const first = data.schemas[0];
257257
setSelectedSchemaName(typeof first === 'string' ? first : first.filename);
258-
const first = data.schemas[0];
259-
setSelectedSchemaName(typeof first === 'string' ? first : first.filename);
260258
} else {
261259
setSelectedSchemaContent("// No schemas found in directory.");
262260
}
@@ -709,12 +707,6 @@ export default function CsvValidator() {
709707
) : availableSchemaNames.length === 0 && !uploadedSchemaName ? (
710708
<SelectItem value="no-schemas" disabled>No schemas found</SelectItem>
711709
) : null}
712-
{availableSchemaNames.map((schema) => {
713-
const value = typeof schema === 'string' ? schema : schema.filename;
714-
const label = typeof schema === 'string' ? schema.replace(/\.json$/, '') : schema.name;
715-
return (
716-
<SelectItem key={value} value={value} className="dark:focus:bg-zinc-700">
717-
{label}
718710
{availableSchemaNames.map((schema) => {
719711
const value = typeof schema === 'string' ? schema : schema.filename;
720712
const label = typeof schema === 'string' ? schema.replace(/\.json$/, '') : schema.name;
@@ -723,8 +715,6 @@ export default function CsvValidator() {
723715
{label}
724716
</SelectItem>
725717
);
726-
})}
727-
);
728718
})}
729719
{uploadedSchemaContent && (
730720
<SelectItem value="uploaded-schema" className="dark:focus:bg-zinc-700">
@@ -859,7 +849,6 @@ export default function CsvValidator() {
859849
</div>
860850
</CardHeader>
861851

862-
<div className="flex flex-col items-center justify-center px-1 pt-1 pb-1">
863852
<div className="flex flex-col items-center justify-center px-1 pt-1 pb-1">
864853
{csvFileName ? (
865854
<button
@@ -873,7 +862,6 @@ export default function CsvValidator() {
873862
aria-label="Upload another CSV file"
874863
>
875864
<Upload className="h-5 w-5 text-[#1e007d] dark:text-blue-300" />
876-
<Upload className="h-5 w-5 text-[#1e007d] dark:text-blue-300" />
877865
</button>
878866
) : (
879867
<button
@@ -887,8 +875,6 @@ export default function CsvValidator() {
887875
>
888876
<Upload className="h-5 w-5 text-[#1e007d] dark:text-blue-300" />
889877
<span className="text-xs font-medium text-[#1e007d] dark:text-blue-200 mt-0.5">Upload CSV</span>
890-
<Upload className="h-5 w-5 text-[#1e007d] dark:text-blue-300" />
891-
<span className="text-xs font-medium text-[#1e007d] dark:text-blue-200 mt-0.5">Upload CSV</span>
892878
</button>
893879
)}
894880
</div>
@@ -1026,7 +1012,6 @@ export default function CsvValidator() {
10261012
</div>
10271013
</CardHeader>
10281014

1029-
<div className="flex flex-col items-center justify-center px-1 pt-1 pb-1">
10301015
<div className="flex flex-col items-center justify-center px-1 pt-1 pb-1">
10311016
{csvFileName ? (
10321017
<button
@@ -1040,7 +1025,6 @@ export default function CsvValidator() {
10401025
aria-label="Upload another CSV file"
10411026
>
10421027
<Upload className="h-5 w-5 text-[#1e007d] dark:text-blue-300" />
1043-
<Upload className="h-5 w-5 text-[#1e007d] dark:text-blue-300" />
10441028
</button>
10451029
) : (
10461030
<button
@@ -1054,8 +1038,6 @@ export default function CsvValidator() {
10541038
>
10551039
<Upload className="h-5 w-5 text-[#1e007d] dark:text-blue-300" />
10561040
<span className="text-xs font-medium text-[#1e007d] dark:text-blue-200 mt-0.5">Upload CSV</span>
1057-
<Upload className="h-5 w-5 text-[#1e007d] dark:text-blue-300" />
1058-
<span className="text-xs font-medium text-[#1e007d] dark:text-blue-200 mt-0.5">Upload CSV</span>
10591041
</button>
10601042
)}
10611043
</div>

jest.config.cjs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
module.exports = {
2-
<<<<<<< HEAD
3-
preset: 'ts-jest',
42
testEnvironment: 'jsdom',
5-
transform: {
6-
'^.+\\.[jt]sx?$': 'ts-jest',
7-
},
8-
=======
9-
testEnvironment: 'jsdom',
10-
>>>>>>> be234e6 (chore: test and performance experiments (web worker, e2e, UI tweaks))
113
moduleNameMapper: {
124
'^@/(.*)$': '<rootDir>/$1',
135
},

package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@
6363
"@testing-library/jest-dom": "^6.6.3",
6464
"@testing-library/react": "^16.3.0",
6565
"@testing-library/user-event": "^14.6.1",
66-
<<<<<<< HEAD
67-
"@types/jest": "^29.5.14",
68-
=======
69-
>>>>>>> be234e6 (chore: test and performance experiments (web worker, e2e, UI tweaks))
7066
"@types/node": "^22.14.0",
7167
"@types/papaparse": "^5.3.15",
7268
"@types/react": "^19",

0 commit comments

Comments
 (0)