🧹

coder · aslilac · Feb 19, 2025 · Feb 5, 2025 · Feb 5, 2025 · Feb 7, 2025
commit 5cd198bb067acee80ade32d3f483581c67537ec0
@@ -14,6 +14,7 @@ import { useMutation, useQuery, useQueryClient } from "react-query";
 import { useNavigate, useParams } from "react-router-dom";
 import { pageTitle } from "utils/page";
 import CreateEditRolePageView from "./CreateEditRolePageView";
+import { ErrorAlert } from "components/Alert/ErrorAlert";
 
 export const CreateEditRolePage: FC = () => {
 	const queryClient = useQueryClient();
@@ -35,10 +36,14 @@ export const CreateEditRolePage: FC = () => {
 	);
 	const role = roleData?.find((role) => role.name === roleName);
 
-	if (isLoading || !organizationPermissions) {
+	if (isLoading) {
 		return <Loader />;
 	}
 
+	if (!organizationPermissions) {
+		return <ErrorAlert error="Failed to load organization permissions" />;
+	}
+
 	return (
 		<>
 			<Helmet>

@@ -6,6 +6,7 @@ import {
 	MockEntitlementsWithMultiOrg,
 	MockOrganization,
 	MockOrganizationAuditorRole,
+	MockOrganizationPermissions,
 	MockUser,
 } from "testHelpers/entities";
 import {
@@ -23,10 +24,14 @@ beforeEach(() => {
 			return HttpResponse.json(MockEntitlementsWithMultiOrg);
 		}),
 		http.post("/api/v2/authcheck", async () => {
-			return HttpResponse.json({
-				editMembers: true,
-				viewDeploymentValues: true,
-			});
+			return HttpResponse.json(
+				Object.fromEntries(
+					Object.entries(MockOrganizationPermissions).map(([key, value]) => [
+						`${MockOrganization.id}.${key}`,
+						value,
+					]),
+				),
+			);
 		}),
 	);
 });

@@ -12,7 +12,6 @@ import type { OrganizationMemberWithUserData, User } from "api/typesGenerated";
 import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog";
 import { EmptyState } from "components/EmptyState/EmptyState";
 import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
-import { Loader } from "components/Loader/Loader";
 import { Stack } from "components/Stack/Stack";
 import { useAuthenticated } from "contexts/auth/RequireAuth";
 import { useOrganizationSettings } from "modules/management/OrganizationSettingsLayout";

@@ -79,6 +79,7 @@ export const OrganizationMembersPageView: FC<
 						onSubmit={addMember}
 					/>
 				)}
+
 				<Table>
 					<TableHeader>
 						<TableRow>
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,6 +79,7 @@ export const OrganizationMembersPageView: FC< @@
     						onSubmit={addMember}
     					/>
     				)}
     				<Table>
     					<TableHeader>
     						<TableRow>
@@ Expand Down @@