Skip to content

Commit 27e4b76

Browse files
authored
Null support (#89)
* Added null support (hopefully)
1 parent c241d4a commit 27e4b76

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

my-app/src/model.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,17 @@ export const model = {
8888
entries.forEach(entry => {
8989
const course = {
9090
code: entry[1].code,
91-
name: entry[1]?.name ?? "null",
92-
location: entry[1]?.location ?? "null",
93-
department: entry[1]?.department ?? "null",
94-
language: entry[1]?.language ?? "null",
95-
description: entry[1]?.description ?? "null",
96-
academicLevel: entry[1]?.academic_level ?? "null",
97-
period: entry[1]?.period ?? "null",
91+
name: entry[1]?.name ?? null,
92+
location: entry[1]?.location ?? null,
93+
department: entry[1]?.department ?? null,
94+
language: entry[1]?.language ?? null,
95+
description: entry[1]?.description ?? null,
96+
academicLevel: entry[1]?.academic_level ?? null,
97+
period: entry[1]?.period ?? null,
9898
credits: entry[1]?.credits ?? 0,
99-
prerequisites: entry[1]?.prerequisites ?? "null",
100-
prerequisites_text: entry[1]?.prerequisites_text ?? "null",
101-
learning_outcomes: entry[1]?.learning_outcomes ?? "null"
99+
prerequisites: entry[1]?.prerequisites ?? null,
100+
prerequisites_text: entry[1]?.prerequisites_text ?? null,
101+
learning_outcomes: entry[1]?.learning_outcomes ?? null
102102
};
103103
this.addCourse(course);
104104
});

my-app/src/presenters/PrerequisitePresenter.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ export const PrerequisitePresenter = observer((props) => {
394394
function loadTree() {
395395

396396
console.log(JSON.stringify(props.selectedCourse.prerequisites, null, 4));
397-
if (props.selectedCourse.prerequisites === "null" || props.selectedCourse.prerequisites.length == 0) {
397+
if (!props.selectedCourse?.prerequisites || props.selectedCourse.prerequisites.length == 0) {
398398
let display_node = createNode("No Prerequisites", "No Prerequisites", "default");
399399
display_node.style["pointerEvents"] = "none";
400400
display_node["className"] = 'no-handles';

my-app/src/presenters/SearchbarPresenter.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const SearchbarPresenter = observer(({ model }) => {
1515
const searchResults = model.filteredCourses.filter(course =>
1616
course.code.toLowerCase().includes(query.toLowerCase()) ||
1717
course.name.toLowerCase().includes(query.toLowerCase()) ||
18-
course.description.toLowerCase().includes(query.toLowerCase())
18+
course.description?.toLowerCase().includes(query.toLowerCase())
1919
);
2020
model.setCurrentSearchText(query);
2121
model.setCurrentSearch(searchResults);

my-app/src/views/ListView.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ function ListView(props) {
111111
className="text-gray-600"
112112
dangerouslySetInnerHTML={{
113113
__html: readMore[course.code]
114-
? course.description
115-
: (course.description.slice(0, 200)+"..."),
114+
? course?.description
115+
: (course?.description?.slice(0, 200)+"..."),
116116
}}
117117
/>
118-
{course.description.length > 150 && (
118+
{course?.description?.length > 150 && (
119119
<span
120120
className="text-blue-500 cursor-pointer"
121121
onClick={(e) => {

0 commit comments

Comments
 (0)