Improve error handling

bluedotimpact · Nov 13, 2023 · 7aad139 · 7aad139
1 parent 76d13b5
commit 7aad139
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/frontend/other.tsx b/frontend/other.tsx
@@ -23,13 +23,23 @@ const OtherPage = () => {
 
   const base = useBase();
 
+  const [recalculating, setRecalculating] = useState<boolean>(false);
+  const [error, setError] = useState<Error | undefined>(undefined);
+
   const configuredPersonTypes = Object.values(preset.personTypes)
     .filter((personType) =>
       personType.cohortOverlapFullField ||
       personType.cohortOverlapPartialField
     )
 
+  if (!preset.cohortsTable) {
+    return <Text>Select a cohorts table</Text>
+  }
   const cohortsTable = base.getTableByIdIfExists(preset.cohortsTable);
+  if (!cohortsTable) {
+    return <Text>Cohorts table ({preset.cohortsTable}) not found</Text>
+  }
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const rawCohorts = useRecords(cohortsTable, {
     fields: [
       preset.cohortsTableStartDateField,
@@ -57,8 +67,6 @@ const OtherPage = () => {
     }];
   });
 
-  const [recalculating, setRecalculating] = useState<boolean>(false);
-  const [error, setError] = useState<Error | undefined>(undefined);
   const recalculateOverlap = async () => {
     try {
       setError(undefined);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,14 +11,14 @@
         "deploy": "node deploy.js"
     },
     "dependencies": {
-        "@airtable/blocks": "^1.17.0",
+        "@airtable/blocks": "^1.18.0",
         "@headlessui/react": "^1.7.7",
         "glpk.js": "^4.0.1",
         "react": "^16.14.0",
         "react-dom": "^16.14.0"
     },
     "devDependencies": {
-        "@airtable/blocks-cli": "^2.0.3",
+        "@airtable/blocks-cli": "^2.0.4",
         "@types/jest": "^29.2.5",
         "@typescript-eslint/eslint-plugin": "^5.48.1",
         "@typescript-eslint/parser": "^5.48.1",