chore: cleanup OrganizationSidebar

jaaydenh · jaaydenh · commit 017a954e9241 · 2025-01-02T16:34:26.000Z
diff --git a/site/src/modules/management/OrganizationSidebar.tsx b/site/src/modules/management/OrganizationSidebar.tsx
@@ -26,7 +26,6 @@ export const OrganizationSidebar: FC = () => {
 		organization?: string;
 	};
 
-	const organization = organizations?.find((o) => o.name === organizationName);
 	const orgPermissionsQuery = useQuery(
 		organizationsPermissions(organizations?.map((o) => o.id)),
 	);
@@ -48,6 +47,8 @@ export const OrganizationSidebar: FC = () => {
 			return canEditOrganization(org.permissions);
 		});
 
+	const organization = editableOrgs?.find((o) => o.name === organizationName);
+
 	return (
 		<OrganizationSidebarView
 			activeOrganization={organization}
diff --git a/site/src/modules/management/OrganizationSidebarView.stories.tsx b/site/src/modules/management/OrganizationSidebarView.stories.tsx
@@ -51,7 +51,10 @@ export const LoadingOrganizations: Story = {
 
 export const NoCreateOrg: Story = {
 	args: {
-		activeOrganization: MockOrganization,
+		activeOrganization: {
+			...MockOrganization,
+			permissions: { createOrganization: false },
+		},
 		permissions: {
 			...MockPermissions,
 			createOrganization: false,
@@ -67,14 +70,28 @@ export const NoCreateOrg: Story = {
 
 export const NoPermissions: Story = {
 	args: {
-		activeOrganization: MockOrganization,
+		activeOrganization: {
+			...MockOrganization,
+			permissions: MockNoPermissions,
+		},
 		permissions: MockNoPermissions,
 	},
 };
 
 export const AllPermissions: Story = {
 	args: {
-		activeOrganization: MockOrganization,
+		activeOrganization: {
+			...MockOrganization,
+			permissions: {
+				editOrganization: true,
+				editMembers: true,
+				editGroups: true,
+				auditOrganization: true,
+				assignOrgRole: true,
+				viewProvisioners: true,
+				viewIdpSyncSettings: true,
+			},
+		},
 		organizations: [
 			{
 				...MockOrganization,
@@ -94,7 +111,16 @@ export const AllPermissions: Story = {
 
 export const SelectedOrgAdmin: Story = {
 	args: {
-		activeOrganization: MockOrganization,
+		activeOrganization: {
+			...MockOrganization,
+			permissions: {
+				editOrganization: true,
+				editMembers: true,
+				editGroups: true,
+				auditOrganization: true,
+				assignOrgRole: true,
+			},
+		},
 		organizations: [
 			{
 				...MockOrganization,
@@ -112,7 +138,15 @@ export const SelectedOrgAdmin: Story = {
 
 export const SelectedOrgAuditor: Story = {
 	args: {
-		activeOrganization: MockOrganization,
+		activeOrganization: {
+			...MockOrganization,
+			permissions: {
+				editOrganization: false,
+				editMembers: false,
+				editGroups: false,
+				auditOrganization: true,
+			},
+		},
 		permissions: {
 			...MockPermissions,
 			createOrganization: false,
@@ -133,7 +167,15 @@ export const SelectedOrgAuditor: Story = {
 
 export const SelectedOrgUserAdmin: Story = {
 	args: {
-		activeOrganization: MockOrganization,
+		activeOrganization: {
+			...MockOrganization,
+			permissions: {
+				editOrganization: false,
+				editMembers: true,
+				editGroups: true,
+				auditOrganization: false,
+			},
+		},
 		permissions: {
 			...MockPermissions,
 			createOrganization: false,
@@ -152,58 +194,6 @@ export const SelectedOrgUserAdmin: Story = {
 	},
 };
 
-export const MultiOrgAdminAndUserAdmin: Story = {
-	args: {
-		activeOrganization: MockOrganization,
-		organizations: [
-			{
-				...MockOrganization,
-				permissions: {
-					editOrganization: false,
-					editMembers: false,
-					editGroups: false,
-					auditOrganization: true,
-				},
-			},
-			{
-				...MockOrganization2,
-				permissions: {
-					editOrganization: false,
-					editMembers: true,
-					editGroups: true,
-					auditOrganization: false,
-				},
-			},
-		],
-	},
-};
-
-export const SelectedMultiOrgAdminAndUserAdmin: Story = {
-	args: {
-		activeOrganization: MockOrganization2,
-		organizations: [
-			{
-				...MockOrganization,
-				permissions: {
-					editOrganization: false,
-					editMembers: false,
-					editGroups: false,
-					auditOrganization: true,
-				},
-			},
-			{
-				...MockOrganization2,
-				permissions: {
-					editOrganization: false,
-					editMembers: true,
-					editGroups: true,
-					auditOrganization: false,
-				},
-			},
-		],
-	},
-};
-
 export const OrgsDisabled: Story = {
 	parameters: {
 		showOrganizations: false,
diff --git a/site/src/modules/management/OrganizationSidebarView.tsx b/site/src/modules/management/OrganizationSidebarView.tsx
