Skip to content

Commit 8de4414

Browse files
authored
Ax/scrum 125 Fix Module Import Linting Errors (#63)
Co-authored-by: Austin-X <[email protected]>
1 parent 3f1c6aa commit 8de4414

File tree

10 files changed

+16
-58
lines changed

10 files changed

+16
-58
lines changed

course-matrix/backend/jest.config.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ import type { Config } from "jest";
22

33
const config: Config = {
44
preset: "ts-jest",
5-
moduleNameMapper: {
6-
"\\.(css|scss)$": "identity-obj-proxy",
7-
"^.+\\.svg": "<rootDir>/tests/mocks/svgMock.tsx",
8-
},
5+
moduleNameMapper: { "\\.(css|scss)$": "identity-obj-proxy" },
96
// to obtain access to the matchers.
10-
setupFilesAfterEnv: ["<rootDir>/tests/setupTests.ts"],
117
moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
128
modulePaths: ["<rootDir>"],
139
testEnvironment: "jsdom",

course-matrix/backend/tests/mocks/svgMock.tsx

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

course-matrix/backend/tests/setupTests.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

course-matrix/backend/tsconfig.app.json

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

course-matrix/frontend/jest.config.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ import type { Config } from "jest";
22

33
const config: Config = {
44
preset: "ts-jest",
5-
moduleNameMapper: {
6-
"\\.(css|scss)$": "identity-obj-proxy",
7-
"^.+\\.svg": "<rootDir>/tests/mocks/svgMock.tsx",
8-
},
5+
moduleNameMapper: { "\\.(css|scss)$": "identity-obj-proxy" },
96
// to obtain access to the matchers.
10-
setupFilesAfterEnv: ["<rootDir>/tests/setupTests.ts"],
117
moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
128
modulePaths: ["<rootDir>"],
139
testEnvironment: "jsdom",

course-matrix/frontend/src/pages/TimetableBuilder/TimetableBuilder.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ const TimetableBuilder = () => {
104104
const [isCustomSettingsOpen, setIsCustomSettingsOpen] = useState(false);
105105
const [filters, setFilters] = useState<FilterForm | null>(null);
106106
const [showFilters, setShowFilters] = useState(false);
107-
const [timetableId, setTimetableId] = useState(-1);
107+
const [timetableId, setTimetableId] = useState(
108+
editingTimetableId ? parseInt(editingTimetableId) : 0,
109+
);
108110

109111
const noSearchAndFilter = () => {
110112
return !searchQuery && !filters;

course-matrix/frontend/tests/mocks/svgMock.tsx

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

course-matrix/frontend/tests/setupTests.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

course-matrix/frontend/tsconfig.app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
"@/*": ["./src/*"]
2828
}
2929
},
30-
"include": ["src", "tests/setupTests.ts"]
30+
"include": ["src"]
3131
}
Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
2+
"files": [],
3+
"references": [
4+
{ "path": "./tsconfig.app.json" },
5+
{ "path": "./tsconfig.node.json" }
6+
],
27
"compilerOptions": {
3-
"target": "es6",
4-
"module": "commonjs",
5-
"outDir": "./build",
6-
"strict": true,
7-
"esModuleInterop": true,
8-
"skipLibCheck": true
9-
},
10-
"include": ["src/**/*"],
11-
"exclude": ["node_modules", "tests"]
8+
"baseUrl": ".",
9+
"paths": {
10+
"@/*": ["./src/*"]
11+
}
12+
}
1213
}

0 commit comments

Comments
 (0)