-
(refs.current[obj.id!] = ref)} />
+
@@ -81,7 +87,12 @@ const handleFootnote = (obj: JsonType, refs: RefType) => {
const handleRef = (obj: JsonType, refs: RefType) => {
return (
-
(refs.current[obj.id!] = ref)} to={obj.href!}>
+
{
+ refs.current[obj.id!] = ref;
+ }}
+ to={obj.href!}
+ >
{obj.body}
);
@@ -227,7 +238,13 @@ export const processingFunctions: Record
(
- (refs.current[obj.id!] = ref)}>{handleRef(obj, refs)}
+ {
+ refs.current[obj.id!] = ref;
+ }}
+ >
+ {handleRef(obj, refs)}
+
),
JAVASCRIPTINLINE: (obj, _refs) => {obj.body},
diff --git a/src/pages/academy/adminPanel/subcomponents/assessmentConfigPanel/AssessmentConfigPanel.tsx b/src/pages/academy/adminPanel/subcomponents/assessmentConfigPanel/AssessmentConfigPanel.tsx
index ef091afd65..9922f18d0e 100644
--- a/src/pages/academy/adminPanel/subcomponents/assessmentConfigPanel/AssessmentConfigPanel.tsx
+++ b/src/pages/academy/adminPanel/subcomponents/assessmentConfigPanel/AssessmentConfigPanel.tsx
@@ -61,7 +61,7 @@ const AssessmentConfigPanel: WithImperativeApi<
React.FC
> = forwardRef(
({ setHasChangesAssessmentConfig, initialConfigs }, imperativeRef) => {
- const gridApi = React.useRef>();
+ const gridApi = React.useRef>(null);
// Create a mutable copy of the initialConfigs to track changes
// to prevent UI flicker during state changes.
const tableState = useRef(cloneDeep(initialConfigs));
diff --git a/src/pages/academy/adminPanel/subcomponents/storiesUserConfigPanel/StoriesUserConfigPanel.tsx b/src/pages/academy/adminPanel/subcomponents/storiesUserConfigPanel/StoriesUserConfigPanel.tsx
index ebb0ae2d10..9a9703c5e8 100644
--- a/src/pages/academy/adminPanel/subcomponents/storiesUserConfigPanel/StoriesUserConfigPanel.tsx
+++ b/src/pages/academy/adminPanel/subcomponents/storiesUserConfigPanel/StoriesUserConfigPanel.tsx
@@ -30,7 +30,7 @@ const defaultColumnDefs: ColDef = {
* no admins left in a course)
*/
const StoriesUserConfigPanel: React.FC = props => {
- const gridApi = React.useRef();
+ const gridApi = React.useRef(null);
const storiesUsers = props.storiesUsers?.map(e =>
!e.name ? { ...e, name: '(user has yet to log in)' } : e
@@ -88,12 +88,10 @@ const StoriesUserConfigPanel: React.FC = props => {
text="Export as CSV"
className="export-csv-button"
onClick={() => {
- if (gridApi.current) {
- gridApi.current.exportDataAsCsv({
- fileName: `SA Stories Users (${new Date().toISOString()}).csv`,
- columnKeys: ['name', 'username', 'role']
- });
- }
+ gridApi.current?.exportDataAsCsv({
+ fileName: `SA Stories Users (${new Date().toISOString()}).csv`,
+ columnKeys: ['name', 'username', 'role']
+ });
}}
/>
diff --git a/src/pages/academy/adminPanel/subcomponents/userConfigPanel/UserConfigPanel.tsx b/src/pages/academy/adminPanel/subcomponents/userConfigPanel/UserConfigPanel.tsx
index 8cc45e44d8..54436a142d 100644
--- a/src/pages/academy/adminPanel/subcomponents/userConfigPanel/UserConfigPanel.tsx
+++ b/src/pages/academy/adminPanel/subcomponents/userConfigPanel/UserConfigPanel.tsx
@@ -30,7 +30,7 @@ const defaultColumnDefs: ColDef = {
* no admins left in a course)
*/
const UserConfigPanel: React.FC
= props => {
- const gridApi = React.useRef();
+ const gridApi = React.useRef(null);
const userCourseRegistrations = props.userCourseRegistrations?.map(e =>
!e.name ? { ...e, name: '(user has yet to log in)' } : e
@@ -89,12 +89,10 @@ const UserConfigPanel: React.FC = props => {
text="Export as CSV"
className="export-csv-button"
onClick={() => {
- if (gridApi.current) {
- gridApi.current.exportDataAsCsv({
- fileName: `SA Users (${new Date().toISOString()}).csv`,
- columnKeys: ['name', 'username', 'group', 'role']
- });
- }
+ gridApi.current?.exportDataAsCsv({
+ fileName: `SA Users (${new Date().toISOString()}).csv`,
+ columnKeys: ['name', 'username', 'group', 'role']
+ });
}}
/>
{
) : (
-
)}
diff --git a/src/pages/sicp/__tests__/Sicp.test.tsx b/src/pages/sicp/__tests__/Sicp.test.tsx
index c18201ae44..12e3f5e26b 100644
--- a/src/pages/sicp/__tests__/Sicp.test.tsx
+++ b/src/pages/sicp/__tests__/Sicp.test.tsx
@@ -2,7 +2,7 @@ import { render } from '@testing-library/react';
import { Provider } from 'react-redux';
import type { Location } from 'react-router';
import { mockInitialStore } from 'src/commons/mocks/StoreMocks';
-import { shallowRender } from 'src/commons/utils/TestUtils';
+import { renderTree } from 'src/commons/utils/TestUtils';
import { vi } from 'vitest';
import Sicp from '../Sicp';
@@ -14,13 +14,13 @@ vi.mock('react-router', () => ({
}));
describe('Sicp renders', () => {
- test('correctly', () => {
+ test('correctly', async () => {
const sicp = (
);
- const tree = shallowRender(sicp);
+ const tree = await renderTree(sicp);
expect(tree).toMatchSnapshot();
});
diff --git a/src/pages/sicp/subcomponents/__tests__/SicpLatex.test.tsx b/src/pages/sicp/subcomponents/__tests__/SicpLatex.test.tsx
index da78044a31..e296a8de17 100644
--- a/src/pages/sicp/subcomponents/__tests__/SicpLatex.test.tsx
+++ b/src/pages/sicp/subcomponents/__tests__/SicpLatex.test.tsx
@@ -1,25 +1,25 @@
-import { shallowRender } from 'src/commons/utils/TestUtils';
+import { renderTree } from 'src/commons/utils/TestUtils';
import SicpLatex from '../SicpLatex';
describe('Sicp latex renders', () => {
- test('correctly block', () => {
+ test('correctly block', async () => {
const props = {
math: '1+1',
inline: false
};
- const tree = shallowRender(
);
+ const tree = await renderTree(
);
expect(tree).toMatchSnapshot();
});
- test('correctly inline', () => {
+ test('correctly inline', async () => {
const props = {
math: '1+1',
inline: true
};
- const tree = shallowRender(
);
+ const tree = await renderTree(
);
expect(tree).toMatchSnapshot();
});
});
diff --git a/src/pages/sicp/subcomponents/__tests__/__snapshots__/SicpIndexPage.test.tsx.snap b/src/pages/sicp/subcomponents/__tests__/__snapshots__/SicpIndexPage.test.tsx.snap
index 35d501e960..0393227c10 100644
--- a/src/pages/sicp/subcomponents/__tests__/__snapshots__/SicpIndexPage.test.tsx.snap
+++ b/src/pages/sicp/subcomponents/__tests__/__snapshots__/SicpIndexPage.test.tsx.snap
@@ -1,798 +1,567 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
exports[`Sicp index page 1`] = `
-
+
-
-
-
- Structure and Interpretation of Computer Programs
-
-
- — JavaScript Edition
-
-
+
-
- Harold Abelson and Gerald Jay Sussman
-
-
- with Julie Sussman
-
- — original authors
-
-
-
- Martin Henz and Tobias Wrigstad
-
-
- with Julie Sussman
-
- — adapters to JavaScript
-
-
-
+
+ Structure and Interpretation of Computer Programs
+
+
+ — JavaScript Edition
+
+
+
- Samuel Fang
-
-
-
- — designer and developer of this Interactive SICP JS edition
-
-
+
+ Harold Abelson and Gerald Jay Sussman
+
+
+ with Julie Sussman
+
+ — original authors
+
+
+
+ Martin Henz and Tobias Wrigstad
+
+
+ with Julie Sussman
+
+ — adapters to JavaScript
+
+
+
+ Samuel Fang
+
+
+
+ — designer and developer of this Interactive SICP JS edition
+
+
+
-
-
- Content
-
-
+
+
+ Content
+
-
-
-
-
+
+ Foreword
+
+
-
-
-
-
-
- Foreword to Structure and Interpretation of Computer Programs, 1984
-
-
-
+
+
+
-