Two is now one

code-asher · code-asher · commit 64631e1448f2 · 2024-08-08T14:54:52.000-08:00
diff --git a/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx b/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx
@@ -28,7 +28,7 @@ export const canEditOrganization = (
   permissions: AuthorizationResponse | undefined,
 ) => {
   return (
-    permissions &&
+    permissions !== undefined &&
     (permissions.editOrganization ||
       permissions.editMembers ||
       permissions.editGroups)
diff --git a/site/src/pages/ManagementSettingsPage/Sidebar.tsx b/site/src/pages/ManagementSettingsPage/Sidebar.tsx
@@ -38,13 +38,10 @@ export const Sidebar: FC = () => {
         permissions: orgPermissionsQuery.data?.[org.id],
       };
     })
-    // TypeScript is not able to infer whether permissions are defined from the
-    // canEditOrganization call, so although redundant this helps figure it out.
-    .filter(
-      (org): org is OrganizationWithPermissions =>
-        org.permissions !== undefined,
-    )
-    .filter((org) => {
+    // TypeScript is not able to infer whether permissions are defined on the
+    // object even if we explicitly check org.permissions here, so add the `is`
+    // here to help out (canEditOrganization does the actual check).
+    .filter((org): org is OrganizationWithPermissions => {
       return canEditOrganization(org.permissions);
     });
 
