fix: colour can be null in zod schema

debater-coder · Oct 13, 2024 · 4423c57 · 4423c57
1 parent 7e05c90
commit 4423c57
Show file tree

Hide file tree

Showing 8 changed files with 5,548 additions and 4,345 deletions.
diff --git a/apps/client/RELEASE_NOTES.md b/apps/client/RELEASE_NOTES.md
@@ -1,5 +1,10 @@
 You can open release notes by going to Settings -> About -> Release notes.
 
+## 1.9.13-beta
+
+- Hotfix: Fix zod schema to fix strange loading state
+- TODO: solve this problem properly in the data-providers branch
+
 ## 1.9.11-beta
 
 - Hotfix: don't rely on SBHS OAuth discovery endpoint (which is currently dead)

diff --git a/apps/client/package.json b/apps/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "1.9.12-beta",
+  "version": "1.9.13-beta",
   "type": "module",
   "scripts": {
     "dev": "npm-run-all --parallel dev:*",

diff --git a/apps/client/src/consumers/sbhsApi/schemas.ts b/apps/client/src/consumers/sbhsApi/schemas.ts
@@ -107,7 +107,7 @@ const bellSchema = z.object({
 });
 
 const subjectSchema = z.object({
-  colour: z.string(),
+  colour: z.string().nullish(),
   fullTeacher: z.string(),
   subject: z.string(),
   title: z.string(),
@@ -350,7 +350,7 @@ const timetableSubjectSchema = z.object({
   teacher: z.string().nullish(),
   fullTeacher: z.string().nullish(),
   year: z.coerce.string().nullish(),
-  colour: z.string(),
+  colour: z.string().nullish(),
 });
 export type TimetableSubject = z.infer<typeof timetableSubjectSchema>;
 

diff --git a/apps/client/src/consumers/sbhsApi/useDtt.ts b/apps/client/src/consumers/sbhsApi/useDtt.ts
@@ -30,7 +30,13 @@ export const useDtt = (date?: string) => {
         : undefined
     ),
     queryFn: () => queryFn(authActions, date),
-    select: (data) => dttSchema.parse(data),
+    select: (data) => {
+      try {
+        return dttSchema.parse(data);
+      } catch (error) {
+        console.error(error);
+      }
+    },
   });
 };
 

diff --git a/apps/client/src/consumers/sbhsApi/useTimetable.ts b/apps/client/src/consumers/sbhsApi/useTimetable.ts
@@ -15,7 +15,13 @@ export const useTimetable = () => {
   return useQuery({
     queryKey: getQueryKey(),
     queryFn: () => queryFn(authActions),
-    select: (data) => timetableSchema.parse(data),
+    select: (data) => {
+      try {
+        return timetableSchema.parse(data);
+      } catch (error) {
+        console.error(error);
+      }
+    },
   });
 };
 

diff --git a/apps/client/src/routes/Main/Home/Schedule.tsx b/apps/client/src/routes/Main/Home/Schedule.tsx
@@ -17,7 +17,7 @@ function generateLoadingPeriods() {
 
 export default function Schedule({ date }: { date?: string }) {
   const { data: dtt } = useDtt(date);
-
+  console.log(dtt);
   const activeKey = dtt?.periods.find(
     ({ startTime, endTime }) =>
       DateTime.fromISO(startTime) < DateTime.now() &&