From 5dae591c79da1da035ab005a784c2dc3bf4c6d65 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Mon, 12 Jun 2023 13:20:42 -0700
Subject: [PATCH] Retry button on introspection errors

---
 src-tauri/tauri.conf.json                  |  2 +-
 src-web/components/GraphQLEditor.tsx       | 23 ++++++++++++++++++++--
 src-web/components/RouteError.tsx          |  5 ++---
 src-web/components/core/FormattedError.tsx | 11 +++++++++++
 src-web/hooks/useIntrospectGraphQL.ts      | 11 ++++++++---
 src-web/lib/responseBody.ts                |  4 ++--
 src-web/lib/theme/window.ts                |  4 ++--
 tailwind.config.cjs                        | 16 ++++++++++++++-
 8 files changed, 62 insertions(+), 14 deletions(-)
 create mode 100644 src-web/components/core/FormattedError.tsx

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index cf3a3c0c..80f1cdf1 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Yaak",
-    "version": "2023.0.17"
+    "version": "2023.0.18"
   },
   "tauri": {
     "windows": [],
diff --git a/src-web/components/GraphQLEditor.tsx b/src-web/components/GraphQLEditor.tsx
index b0987c02..d19ed0d4 100644
--- a/src-web/components/GraphQLEditor.tsx
+++ b/src-web/components/GraphQLEditor.tsx
@@ -6,6 +6,7 @@ import type { HttpRequest } from '../lib/models';
 import { Button } from './core/Button';
 import type { EditorProps } from './core/Editor';
 import { Editor, formatGraphQL } from './core/Editor';
+import { FormattedError } from './core/FormattedError';
 import { Separator } from './core/Separator';
 import { useDialog } from './DialogContext';
 
@@ -24,7 +25,7 @@ interface GraphQLBody {
 
 export function GraphQLEditor({ defaultValue, onChange, baseRequest, ...extraEditorProps }: Props) {
   const editorViewRef = useRef<EditorView>(null);
-  const { schema, isLoading, error } = useIntrospectGraphQL(baseRequest);
+  const { schema, isLoading, error, refetch } = useIntrospectGraphQL(baseRequest);
   const { query, variables } = useMemo<GraphQLBody>(() => {
     if (defaultValue === undefined) {
       return { query: '', variables: {} };
@@ -89,7 +90,25 @@ export function GraphQLEditor({ defaultValue, onChange, baseRequest, ...extraEdi
                 dialog.show({
                   title: 'Introspection Failed',
                   size: 'sm',
-                  render: () => <div className="whitespace-pre-wrap">{error}</div>,
+                  id: 'introspection-failed',
+                  render: () => (
+                    <div className="whitespace-pre-wrap">
+                      <FormattedError>{error ?? 'unknown'}</FormattedError>
+                      <div className="w-full mt-3">
+                        <Button
+                          onClick={() => {
+                            dialog.hide('introspection-failed');
+                            refetch();
+                          }}
+                          className="ml-auto"
+                          color="secondary"
+                          size="sm"
+                        >
+                          Try Again
+                        </Button>
+                      </div>
+                    </div>
+                  ),
                 });
               }}
             >
diff --git a/src-web/components/RouteError.tsx b/src-web/components/RouteError.tsx
index 2feb82b3..eb5f268b 100644
--- a/src-web/components/RouteError.tsx
+++ b/src-web/components/RouteError.tsx
@@ -1,6 +1,7 @@
 import { useRouteError } from 'react-router-dom';
 import { useAppRoutes } from '../hooks/useAppRoutes';
 import { Button } from './core/Button';
+import { FormattedError } from './core/FormattedError';
 import { Heading } from './core/Heading';
 import { VStack } from './core/Stacks';
 
@@ -14,9 +15,7 @@ export default function RouteError() {
     <div className="flex items-center justify-center h-full">
       <VStack space={5} className="max-w-[30rem] !h-auto">
         <Heading>Route Error 🔥</Heading>
-        <pre className="text-sm select-auto cursor-text bg-gray-100 p-3 rounded whitespace-normal">
-          {message}
-        </pre>
+        <FormattedError>{message}</FormattedError>
         <VStack space={2}>
           <Button
             color="primary"
diff --git a/src-web/components/core/FormattedError.tsx b/src-web/components/core/FormattedError.tsx
new file mode 100644
index 00000000..c1f0c68d
--- /dev/null
+++ b/src-web/components/core/FormattedError.tsx
@@ -0,0 +1,11 @@
+interface Props {
+  children: string;
+}
+
+export function FormattedError({ children }: Props) {
+  return (
+    <pre className="text-sm select-auto cursor-text bg-gray-100 p-3 rounded whitespace-normal border border-red-500 border-dashed">
+      {children}
+    </pre>
+  );
+}
diff --git a/src-web/hooks/useIntrospectGraphQL.ts b/src-web/hooks/useIntrospectGraphQL.ts
index 317970b9..3392642a 100644
--- a/src-web/hooks/useIntrospectGraphQL.ts
+++ b/src-web/hooks/useIntrospectGraphQL.ts
@@ -1,5 +1,5 @@
 import type { IntrospectionQuery } from 'graphql';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useLocalStorage } from 'react-use';
 import { buildClientSchema, getIntrospectionQuery } from '../components/core/Editor';
 import { minPromiseMillis } from '../lib/minPromiseMillis';
@@ -17,6 +17,7 @@ export function useIntrospectGraphQL(baseRequest: HttpRequest) {
   // Debounce the request because it can change rapidly and we don't
   // want to send so too many requests.
   const request = useDebouncedValue(baseRequest);
+  const [refetchKey, setRefetchKey] = useState<number>(0);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [error, setError] = useState<string>();
   const [introspection, setIntrospection] = useLocalStorage<IntrospectionQuery>(
@@ -63,12 +64,16 @@ export function useIntrospectGraphQL(baseRequest: HttpRequest) {
     runIntrospection(); // Run immediately
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [request.id, request.method]);
+  }, [request.id, request.url, request.method, refetchKey]);
+
+  const refetch = useCallback(() => {
+    setRefetchKey((k) => k + 1);
+  }, []);
 
   const schema = useMemo(
     () => (introspection ? buildClientSchema(introspection) : undefined),
     [introspection],
   );
 
-  return { schema, isLoading, error };
+  return { schema, isLoading, error, refetch };
 }
diff --git a/src-web/lib/responseBody.ts b/src-web/lib/responseBody.ts
index 31edb70e..1c25c981 100644
--- a/src-web/lib/responseBody.ts
+++ b/src-web/lib/responseBody.ts
@@ -3,7 +3,7 @@ import type { HttpResponse } from './models';
 
 export async function getResponseBodyText(response: HttpResponse): Promise<string | null> {
   if (response.body) {
-    const uint8Array = Uint8Array.of(...response.body);
+    const uint8Array = Uint8Array.from(response.body);
     return new TextDecoder().decode(uint8Array);
   }
   if (response.bodyPath) {
@@ -14,7 +14,7 @@ export async function getResponseBodyText(response: HttpResponse): Promise<strin
 
 export async function getResponseBodyBlob(response: HttpResponse): Promise<Uint8Array | null> {
   if (response.body) {
-    return Uint8Array.of(...response.body);
+    return Uint8Array.from(response.body);
   }
   if (response.bodyPath) {
     return readBinaryFile(response.bodyPath);
diff --git a/src-web/lib/theme/window.ts b/src-web/lib/theme/window.ts
index 9f665ef6..0d7ebdee 100644
--- a/src-web/lib/theme/window.ts
+++ b/src-web/lib/theme/window.ts
@@ -8,9 +8,9 @@ const darkTheme: AppTheme = {
   appearance: 'dark',
   layers: {
     root: {
-      blackPoint: 0.09,
+      blackPoint: 0.2,
       colors: {
-        gray: '#9b8ebe',
+        gray: '#6b5b98',
         red: '#ff417b',
         orange: '#fd9014',
         yellow: '#e8d13f',
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index c7bcd692..1d29d1ce 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -29,7 +29,21 @@ module.exports = {
     },
     fontFamily: {
       "mono": ["JetBrains Mono", "Menlo", "monospace"],
-      "sans": ["Inter", "sans-serif"]
+      "sans": [
+        "Inter",
+        "-apple-system",
+        "BlinkMacSystemFont",
+        "Segoe UI",
+        "Roboto",
+        "Oxygen-Sans",
+        "Ubuntu",
+        "Cantarell",
+        "Helvetica Neue",
+        "sans-serif",
+        "Apple Color Emoji",
+        "Segoe UI Emoji",
+        "Segoe UI Symbol",
+      ],
     },
     fontSize: {
       '3xs': "0.6rem",