🧹

aslilac · aslilac · commit bda6d7579deb · 2024-06-24T22:31:49.000Z
diff --git a/site/src/components/Alert/Alert.tsx b/site/src/components/Alert/Alert.tsx
@@ -52,7 +52,7 @@ export const Alert: FC<AlertProps> = ({
                 size="small"
                 onClick={() => {
                   setOpen(false);
-                  onDismiss && onDismiss();
+                  onDismiss?.();
                 }}
                 data-testid="dismiss-banner-btn"
               >
diff --git a/site/src/pages/ManagementSettingsPage/CreateOrganizationPage.tsx b/site/src/pages/ManagementSettingsPage/CreateOrganizationPage.tsx
@@ -6,6 +6,7 @@ import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { displaySuccess } from "components/GlobalSnackbar/utils";
 import { Stack } from "components/Stack/Stack";
 import { CreateOrganizationPageView } from "./CreateOrganizationPageView";
+import { isApiValidationError } from "api/errors";
 
 const CreateOrganizationPage: FC = () => {
   const navigate = useNavigate();
@@ -19,13 +20,15 @@ const CreateOrganizationPage: FC = () => {
 
   return (
     <Stack>
-      {Boolean(error) && <ErrorAlert error={error} />}
+      {Boolean(error) && !isApiValidationError(error) && (
+        <ErrorAlert error={error} />
+      )}
 
       <CreateOrganizationPageView
         error={error}
         onSubmit={async (values) => {
           await createOrganizationMutation.mutateAsync(values);
-          displaySuccess("Organization settings updated.");
+          displaySuccess("Organization created.");
           navigate(`/organizations/${values.name}`);
         }}
       />
diff --git a/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx b/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx
@@ -5,11 +5,13 @@ import {
   updateOrganization,
   deleteOrganization,
 } from "api/queries/organizations";
+import { isApiValidationError } from "api/errors";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { displaySuccess } from "components/GlobalSnackbar/utils";
 import { Stack } from "components/Stack/Stack";
 import { useOrganizationSettings } from "./ManagementSettingsLayout";
 import { OrganizationSettingsPageView } from "./OrganizationSettingsPageView";
+import { EmptyState } from "components/EmptyState/EmptyState";
 
 const OrganizationSettingsPage: FC = () => {
   const navigate = useNavigate();
@@ -29,17 +31,15 @@ const OrganizationSettingsPage: FC = () => {
   const error =
     updateOrganizationMutation.error ?? deleteOrganizationMutation.error;
 
-  if (!currentOrganizationId) {
-    return null;
-  }
-
-  if (!org) {
-    return null;
+  if (!currentOrganizationId || !org) {
+    return <EmptyState message="Organization not found" />;
   }
 
   return (
     <Stack>
-      {Boolean(error) && <ErrorAlert error={error} />}
+      {Boolean(error) && !isApiValidationError(error) && (
+        <ErrorAlert error={error} />
+      )}
 
       <OrganizationSettingsPageView
         organization={org}
diff --git a/site/src/pages/ManagementSettingsPage/Sidebar.tsx b/site/src/pages/ManagementSettingsPage/Sidebar.tsx
@@ -56,7 +56,9 @@ const DeploymentSettingsNavigation: FC = () => {
       <SidebarNavItem
         active={active}
         href="/deployment/general"
-        icon={<SettingsIcon css={{ width: 16, height: 16 }} />}
+        // 24px matches the width of the organization icons, and the component is smart enough
+        // to keep the icon itself square. It looks too big if it's 24x24.
+        icon={<SettingsIcon css={{ width: 24, height: 20 }} />}
       >
         Deployment
       </SidebarNavItem>
diff --git a/site/src/theme/mui.ts b/site/src/theme/mui.ts
@@ -46,6 +46,13 @@ export const components = {
       ::placeholder {
         color: ${theme.palette.text.disabled};
       }
+
+      fieldset {
+        border: unset;
+        padding: 0;
+        margin: 0;
+        width: 100%;
+      }
     `,
   },
   MuiAvatar: {

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ export const Alert: FC<AlertProps> = ({`
`52`	`52`	`size="small"`
`53`	`53`	`onClick={() => {`
`54`	`54`	`setOpen(false);`
`55`		`- onDismiss && onDismiss();`
	`55`	`+ onDismiss?.();`
`56`	`56`	`}}`
`57`	`57`	`data-testid="dismiss-banner-btn"`
`58`	`58`	`>`