Skip to content

Commit d32a5e1

Browse files
authored
fix: fix UI bugs for orgs (#16302)
resolves coder/internal#288 resolves coder/internal#287 Fixes alignment issue on create organizations page when license banner is visible. before <img width="1178" alt="Screenshot 2025-01-27 at 18 36 35" src="https://github.com/user-attachments/assets/b845f1df-adb3-4876-aba5-8fa9d56eb22b" /> after <img width="961" alt="Screenshot 2025-01-27 at 18 47 06" src="https://github.com/user-attachments/assets/4a6374f9-9571-453c-9258-9cc4631afb77" />
1 parent 1336925 commit d32a5e1

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

site/src/modules/management/OrganizationSidebarView.tsx

+8-2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ const OrganizationsSettingsNavigation: FC<
8686
return <Loader />;
8787
}
8888

89+
// Sort organizations to put active organization first
90+
const sortedOrganizations = [
91+
activeOrganization,
92+
...organizations.filter((org) => org.id !== activeOrganization.id),
93+
];
94+
8995
const [isPopoverOpen, setIsPopoverOpen] = useState(false);
9096
const navigate = useNavigate();
9197

@@ -117,9 +123,9 @@ const OrganizationsSettingsNavigation: FC<
117123
<Command loop>
118124
<CommandList>
119125
<CommandGroup className="pb-2">
120-
{organizations.length > 1 && (
126+
{sortedOrganizations.length > 1 && (
121127
<div className="flex flex-col max-h-[260px] overflow-y-auto">
122-
{organizations.map((organization) => (
128+
{sortedOrganizations.map((organization) => (
123129
<CommandItem
124130
key={organization.id}
125131
value={organization.name}

site/src/pages/ManagementSettingsPage/CreateOrganizationPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const CreateOrganizationPage: FC = () => {
1818
const error = createOrganizationMutation.error;
1919

2020
return (
21-
<main className="py-20 sm:py-7">
21+
<main className="py-7">
2222
<CreateOrganizationPageView
2323
error={error}
2424
isEntitled={feats.multiple_organizations}

site/src/pages/ManagementSettingsPage/CreateOrganizationPageView.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export const CreateOrganizationPageView: FC<
6464

6565
return (
6666
<div className="flex flex-row font-medium">
67-
<div className="absolute top-40 left-12">
67+
<div className="absolute left-12">
6868
<Link
6969
to="/organizations"
7070
className="flex flex-row items-center gap-2 no-underline text-content-secondary hover:text-content-primary"
@@ -73,7 +73,7 @@ export const CreateOrganizationPageView: FC<
7373
Go Back
7474
</Link>
7575
</div>
76-
<div className="flex flex-col gap-4 w-full min-w-72 mx-auto">
76+
<div className="flex flex-col gap-4 w-full min-w-96 mx-auto">
7777
<div className="flex flex-col items-center">
7878
{Boolean(error) && !isApiValidationError(error) && (
7979
<div css={{ marginBottom: 32 }}>

site/src/pages/ManagementSettingsPage/OrganizationProvisionersPage.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ const OrganizationProvisionersPage: FC = () => {
2929
<>
3030
<Helmet>
3131
<title>
32-
{pageTitle("Members", organization.display_name || organization.name)}
32+
{pageTitle(
33+
"Provisioners",
34+
organization.display_name || organization.name,
35+
)}
3336
</title>
3437
</Helmet>
3538
<OrganizationProvisionersPageView

0 commit comments

Comments
 (0)