Merge pull request #10 from TaylorS15/taylor-working

bug fix
TaylorS15 · Feb 20, 2023 · d295828 · d295828
2 parents 530e13b + f61fc71
commit d295828
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 34 deletions.
diff --git a/frontend/src/api/docs.ts b/frontend/src/api/docs.ts
@@ -1,18 +1,22 @@
 import { Doc } from '../models/misc';
 
-export async function getDocs(): Promise<Array<Doc>> {
-  //Fetch default source docs
-  const response = await fetch(
-    'https://d3dg1063dc54p9.cloudfront.net/combined.json',
-  );
-  const data = await response.json();
+export async function getDocs(): Promise<Array<Doc> | null> {
+  try {
+    //Fetch default source docs
+    const response = await fetch(
+      'https://d3dg1063dc54p9.cloudfront.net/combined.json',
+    );
+    const data = await response.json();
 
-  //Create array of Doc objects
-  const docs: Array<Doc> = [];
+    //Create array of Doc objects
+    const docs: Array<Doc> = [];
 
-  data.forEach((doc: Doc) => {
-    docs.push(doc);
-  });
+    data.forEach((doc: Doc) => {
+      docs.push(doc);
+    });
 
-  return docs;
+    return docs;
+  } catch (error) {
+    return null;
+  }
 }
diff --git a/frontend/src/preferences/SelectDocsModal.tsx b/frontend/src/preferences/SelectDocsModal.tsx
@@ -14,10 +14,10 @@ export default function APIKeyModal({
   isCancellable?: boolean;
 }) {
   const dispatch = useDispatch();
-  const [isError, setIsError] = useState(false);
-  const [docs, setDocs] = useState<Doc[]>([]);
+  const [docs, setDocs] = useState<Doc[] | null>(null);
   const [localSelectedDocs, setLocalSelectedDocs] = useState<Doc | null>(null);
   const [isDocsListOpen, setIsDocsListOpen] = useState(false);
+  const [isError, setIsError] = useState(false);
 
   function handleSubmit() {
     if (!localSelectedDocs) {
@@ -31,7 +31,7 @@ export default function APIKeyModal({
   }
 
   function handleCancel() {
-    setSelectedDocs(null);
+    setLocalSelectedDocs(null);
     setIsError(false);
     setModalState('INACTIVE');
   }
@@ -71,25 +71,31 @@ export default function APIKeyModal({
             )}
           </div>
           {isDocsListOpen && (
-            <div className="absolute top-10 left-0 h-52 w-full overflow-y-scroll bg-white">
-              {docs.map((doc, index) => {
-                if (doc.model) {
-                  return (
-                    <div
-                      key={index}
-                      onClick={() => {
-                        setLocalSelectedDocs(doc);
-                        setIsDocsListOpen(false);
-                      }}
-                      className="h-10 w-full cursor-pointer border-x-2 border-b-2 hover:bg-gray-100"
-                    >
-                      <p className="ml-5 py-3">
-                        {doc.name} {doc.version}
-                      </p>
-                    </div>
-                  );
-                }
-              })}
+            <div className="absolute top-10 left-0 max-h-52 w-full overflow-y-scroll bg-white">
+              {docs ? (
+                docs.map((doc, index) => {
+                  if (doc.model) {
+                    return (
+                      <div
+                        key={index}
+                        onClick={() => {
+                          setLocalSelectedDocs(doc);
+                          setIsDocsListOpen(false);
+                        }}
+                        className="h-10 w-full cursor-pointer border-x-2 border-b-2 hover:bg-gray-100"
+                      >
+                        <p className="ml-5 py-3">
+                          {doc.name} {doc.version}
+                        </p>
+                      </div>
+                    );
+                  }
+                })
+              ) : (
+                <div className="h-10 w-full cursor-pointer border-x-2 border-b-2 hover:bg-gray-100">
+                  <p className="ml-5 py-3">No default documentation.</p>
+                </div>
+              )}
             </div>
           )}
         </div>