From 342491934f4bcfccf251bbd92cf63d9abcf53d6e Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Fri, 12 Jan 2024 11:54:58 -0900
Subject: [PATCH 1/2] Display error when fetching OAuth2 provider apps

---
 .../OAuth2AppsSettingsPage/OAuth2AppsSettingsPage.tsx  |  1 +
 .../OAuth2AppsSettingsPageView.stories.tsx             |  7 +++++++
 .../OAuth2AppsSettingsPageView.tsx                     | 10 +++++++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPage.tsx b/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPage.tsx
index 6e2035f2f9107..4d81d7dfb5f13 100644
--- a/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPage.tsx
+++ b/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPage.tsx
@@ -18,6 +18,7 @@ const OAuth2AppsSettingsPage: FC = () => {
       <OAuth2AppsSettingsPageView
         apps={appsQuery.data}
         isLoading={appsQuery.isLoading}
+        error={appsQuery.error}
         isEntitled={
           entitlements.features.oauth2_provider.entitlement !== "not_entitled"
         }
diff --git a/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.stories.tsx b/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.stories.tsx
index 8987099d732cb..71ec930b69de9 100644
--- a/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.stories.tsx
+++ b/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.stories.tsx
@@ -16,6 +16,13 @@ export const Loading: Story = {
   },
 };
 
+export const Error: Story = {
+  args: {
+    isLoading: false,
+    error: "some error",
+  },
+};
+
 export const Unentitled: Story = {
   args: {
     isLoading: false,
diff --git a/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.tsx b/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.tsx
index 7a0ce70ee9d5a..75c3413f242f2 100644
--- a/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.tsx
+++ b/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.tsx
@@ -19,6 +19,7 @@ import {
   EnterpriseBadge,
   EntitledBadge,
 } from "components/Badges/Badges";
+import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { TableLoader } from "components/TableLoader/TableLoader";
 import { Stack } from "components/Stack/Stack";
 import { useClickableTableRow } from "hooks/useClickableTableRow";
@@ -28,12 +29,14 @@ type OAuth2AppsSettingsProps = {
   apps?: TypesGen.OAuth2ProviderApp[];
   isEntitled: boolean;
   isLoading: boolean;
+  error?: unknown;
 };
 
 const OAuth2AppsSettingsPageView: FC<OAuth2AppsSettingsProps> = ({
   apps,
   isEntitled,
   isLoading,
+  error,
 }) => {
   return (
     <>
@@ -62,6 +65,8 @@ const OAuth2AppsSettingsPageView: FC<OAuth2AppsSettingsProps> = ({
         </Button>
       </Stack>
 
+      {error && <ErrorAlert error={error} />}
+
       <TableContainer css={{ marginTop: 32 }}>
         <Table>
           <TableHead>
@@ -72,9 +77,8 @@ const OAuth2AppsSettingsPageView: FC<OAuth2AppsSettingsProps> = ({
           </TableHead>
           <TableBody>
             {isLoading && <TableLoader />}
-            {!isLoading &&
-              apps?.map((app) => <OAuth2AppRow key={app.id} app={app} />)}
-            {!isLoading && (!apps || apps?.length === 0) && (
+            {apps?.map((app) => <OAuth2AppRow key={app.id} app={app} />)}
+            {apps?.length === 0 && (
               <TableRow>
                 <TableCell colSpan={999}>
                   <div css={{ textAlign: "center" }}>

From f865f9149688c6c5ac6d5c54c9415ce4872d2074 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Mon, 22 Jan 2024 09:21:08 -0900
Subject: [PATCH 2/2] No undefined error

---
 .../OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.tsx b/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.tsx
index 75c3413f242f2..39f1ad6e30d35 100644
--- a/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.tsx
+++ b/site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.tsx
@@ -29,7 +29,7 @@ type OAuth2AppsSettingsProps = {
   apps?: TypesGen.OAuth2ProviderApp[];
   isEntitled: boolean;
   isLoading: boolean;
-  error?: unknown;
+  error: unknown;
 };
 
 const OAuth2AppsSettingsPageView: FC<OAuth2AppsSettingsProps> = ({