Skip to content

fix: use multi-org settings layout even if not licensed #14215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 9, 2024
Merged

fix: use multi-org settings layout even if not licensed #14215

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6f70bb1
fix: only check flag for organization settings
code-asher Aug 8, 2024
eb9318c
Move deployment settings header to components
code-asher Aug 7, 2024
b4663c1
Add premium badge
code-asher Aug 9, 2024
71561c8
Use settings header on org pages
code-asher Aug 7, 2024
cb6c6bb
Add license badges to create org page
code-asher Aug 7, 2024
dd3a470
Change create org form description text
code-asher Aug 7, 2024
46a28e0
Consistently capitalize
code-asher Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Consistently capitalize
  • Loading branch information
@code-asher
code-asher committed Aug 9, 2024
commit 46a28e09c3847c572b4cd48d44813625b6874a1b
2 changes: 1 addition & 1 deletion site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const CreateEditRolePageView: FC<CreateEditRolePageViewProps> = ({
justifyContent="space-between"
>
<SettingsHeader
title={`${role ? "Edit" : "Create"} custom role`}
title={`${role ? "Edit" : "Create"} Custom Role`}
description="Set a name and permissions for this role."
/>
{canAssignOrgRole && (
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/ManagementSettingsPage/OrganizationMembersPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const OrganizationMembersPageView: FC<
> = (props) => {
return (
<div>
<SettingsHeader title="Organization members" />
<SettingsHeader title="Members" />

<Stack>
{Boolean(props.error) && <ErrorAlert error={props.error} />}
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const OrganizationSettingsPageView: FC<

return (
<div>
<SettingsHeader title="Organization settings" />
<SettingsHeader title="Settings" />

{Boolean(error) && !isApiValidationError(error) && (
<div css={{ marginBottom: 32 }}>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/ManagementSettingsPage/SidebarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ const OrganizationSettingsNavigation: FC<
<Stack spacing={0.5} css={{ marginBottom: 8, marginTop: 8 }}>
{organization.permissions.editOrganization && (
<SidebarNavSubItem end href={urlForSubpage(organization.name)}>
Organization settings
Settings
</SidebarNavSubItem>
)}
{organization.permissions.editMembers && (
Expand Down
Loading