Skip to content

feat: create and modify organization groups #13887

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 14 commits into from
Jul 22, 2024
Merged

feat: create and modify organization groups #13887

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6f5952e
🫣
aslilac Jul 12, 2024
504f561
Merge branch 'main' into org-groups
aslilac Jul 17, 2024
46cb3c7
fix a bunch of stuff
aslilac Jul 17, 2024
571bb5e
🧹
aslilac Jul 17, 2024
9cdee44
u
aslilac Jul 17, 2024
3399d21
iykyk
aslilac Jul 17, 2024
b252a50
do the thing here too
aslilac Jul 17, 2024
5ef6485
:^)
aslilac Jul 18, 2024
0c2ddac
better
aslilac Jul 18, 2024
91732b6
oops
aslilac Jul 18, 2024
40faf01
Merge branch 'main' into org-groups
aslilac Jul 19, 2024
560fd4f
query refetching is cool
aslilac Jul 19, 2024
c636009
feedback
aslilac Jul 19, 2024
bdf5965
🧹
aslilac Jul 19, 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
Next Next commit
fix a bunch of stuff
  • Loading branch information
@aslilac
aslilac committed Jul 17, 2024
commit 46cb3c7c60e4c5cdd6cf19de082b0c53a1fa8fbc
2 changes: 1 addition & 1 deletion site/src/pages/ManagementSettingsPage/GroupsPage/CreateGroupPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const CreateGroupPage: FC = () => {
<CreateGroupPageView
onSubmit={async (data) => {
const newGroup = await createGroupMutation.mutateAsync(data);
navigate(`/groups/${newGroup.name}`);
navigate(`/organizations/${organization}/groups/${newGroup.name}`);
}}
error={createGroupMutation.error}
isLoading={createGroupMutation.isLoading}
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/ManagementSettingsPage/GroupsPage/GroupPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export const GroupPage: FC = () => {
try {
await deleteGroupMutation.mutateAsync(groupId);
displaySuccess("Group deleted successfully.");
navigate("/groups");
navigate("..");
} catch (error) {
displayError(getErrorMessage(error, "Failed to delete group."));
}
Expand Down
10 changes: 5 additions & 5 deletions ...ingsPage/GroupsPage/SettingsGroupPage.tsx → ...ingsPage/GroupsPage/GroupSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import { ErrorAlert } from "components/Alert/ErrorAlert";
import { displayError } from "components/GlobalSnackbar/utils";
import { Loader } from "components/Loader/Loader";
import { pageTitle } from "utils/page";
import SettingsGroupPageView from "./SettingsGroupPageView";
import GroupSettingsPageView from "./GroupSettingsPageView";

export const SettingsGroupPage: FC = () => {
export const GroupSettingsPage: FC = () => {
const { organization, groupName } = useParams() as {
organization: string;
groupName: string;
Expand Down Expand Up @@ -48,7 +48,7 @@ export const SettingsGroupPage: FC = () => {
<>
{helmet}

<SettingsGroupPageView
<GroupSettingsPageView
onCancel={navigateToGroup}
onSubmit={async (data) => {
try {
Expand All @@ -58,7 +58,7 @@ export const SettingsGroupPage: FC = () => {
add_users: [],
remove_users: [],
});
navigate(`/groups/${data.name}`, { replace: true });
navigate(`../${data.name}`);
} catch (error) {
displayError(getErrorMessage(error, "Failed to update group"));
}
Expand All @@ -71,4 +71,4 @@ export const SettingsGroupPage: FC = () => {
</>
);
};
export default SettingsGroupPage;
export default GroupSettingsPage;
12 changes: 6 additions & 6 deletions ...upsPage/SettingsGroupPageView.stories.tsx → ...upsPage/GroupSettingsPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { action } from "@storybook/addon-actions";
import type { Meta, StoryObj } from "@storybook/react";
import { MockGroup } from "testHelpers/entities";
import { SettingsGroupPageView } from "./SettingsGroupPageView";
import GroupSettingsPageView from "./GroupSettingsPageView";

const meta: Meta<typeof SettingsGroupPageView> = {
title: "pages/GroupsPage/SettingsGroupPageView",
component: SettingsGroupPageView,
const meta: Meta<typeof GroupSettingsPageView> = {
title: "pages/GroupsPage/GroupSettingsPageView",
component: GroupSettingsPageView,
args: {
onCancel: action("onCancel"),
group: MockGroup,
Expand All @@ -14,8 +14,8 @@ const meta: Meta<typeof SettingsGroupPageView> = {
};

export default meta;
type Story = StoryObj<typeof SettingsGroupPageView>;
type Story = StoryObj<typeof GroupSettingsPageView>;

const Example: Story = {};

export { Example as SettingsGroupPageView };
export { Example as GroupSettingsPageView };
9 changes: 3 additions & 6 deletions ...Page/GroupsPage/SettingsGroupPageView.tsx → ...Page/GroupsPage/GroupSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,12 @@ const UpdateGroupForm: FC<UpdateGroupFormProps> = ({
label="Name"
disabled={isEveryoneGroup(group)}
/>
{isEveryoneGroup(group) ? (
<></>
) : (
{!isEveryoneGroup(group) && (
<>
<TextField
{...getFieldHelpers("display_name", {
helperText: "Optional: keep empty to default to the name.",
})}
onChange={onChangeTrimmed(form)}
autoComplete="display_name"
autoFocus
fullWidth
Expand Down Expand Up @@ -120,7 +117,7 @@ export type SettingsGroupPageViewProps = {
isUpdating: boolean;
};

export const SettingsGroupPageView: FC<SettingsGroupPageViewProps> = ({
const GroupSettingsPageView: FC<SettingsGroupPageViewProps> = ({
onCancel,
onSubmit,
group,
Expand All @@ -145,4 +142,4 @@ export const SettingsGroupPageView: FC<SettingsGroupPageViewProps> = ({
);
};

export default SettingsGroupPageView;
export default GroupSettingsPageView;
5 changes: 3 additions & 2 deletions site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@
import { displayError } from "components/GlobalSnackbar/utils";
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
import { useAuthenticated } from "contexts/auth/RequireAuth";
import { useDashboard } from "modules/dashboard/useDashboard";

Check failure on line 12 in site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx

View workflow job for this annotation

GitHub Actions / lint 

'useDashboard' is defined but never used. Allowed unused vars must match /^_/u

Check failure on line 12 in site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx

View workflow job for this annotation

GitHub Actions / lint 

'useDashboard' is defined but never used. Allowed unused vars must match /^_/u

Check failure on line 12 in site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx

View workflow job for this annotation

GitHub Actions / fmt 

'useDashboard' is defined but never used. Allowed unused vars must match /^_/u
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
import { pageTitle } from "utils/page";
import GroupsPageView from "./GroupsPageView";
import { useOrganizationSettings } from "../ManagementSettingsLayout";

Check failure on line 16 in site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx

View workflow job for this annotation

GitHub Actions / lint 

`../ManagementSettingsLayout` import should occur before import of `./GroupsPageView`

Check failure on line 16 in site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx

View workflow job for this annotation

GitHub Actions / lint 

`../ManagementSettingsLayout` import should occur before import of `./GroupsPageView`

export const GroupsPage: FC = () => {
const { permissions } = useAuthenticated();
const { organizationId } = useDashboard();
const { currentOrganizationId } = useOrganizationSettings();
const { createGroup: canCreateGroup } = permissions;
const { template_rbac: isTemplateRBACEnabled } = useFeatureVisibility();
const groupsQuery = useQuery(groups(organizationId));
const groupsQuery = useQuery(groups(currentOrganizationId!));

useEffect(() => {
if (groupsQuery.error) {
Expand Down
8 changes: 0 additions & 8 deletions site/src/pages/ManagementSettingsPage/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,20 +118,12 @@ export const OrganizationSettingsNavigation: FC<
<SidebarNavSubItem end href={urlForSubpage(organization.name)}>
Organization settings
</SidebarNavSubItem>
<SidebarNavSubItem
href={urlForSubpage(organization.name, "external-auth")}
>
External authentication
</SidebarNavSubItem>
<SidebarNavSubItem href={urlForSubpage(organization.name, "members")}>
Members
</SidebarNavSubItem>
<SidebarNavSubItem href={urlForSubpage(organization.name, "groups")}>
Groups
</SidebarNavSubItem>
<SidebarNavSubItem href={urlForSubpage(organization.name, "metrics")}>
Metrics
</SidebarNavSubItem>
<SidebarNavSubItem
href={urlForSubpage(organization.name, "auditing")}
>
Expand Down
2 changes: 1 addition & 1 deletion site/src/router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ const OrganizationGroupPage = lazy(
() => import("./pages/ManagementSettingsPage/GroupsPage/GroupPage"),
);
const OrganizationGroupSettingsPage = lazy(
() => import("./pages/ManagementSettingsPage/GroupsPage/SettingsGroupPage"),
() => import("./pages/ManagementSettingsPage/GroupsPage/GroupSettingsPage"),
);
const OrganizationMembersPage = lazy(
() => import("./pages/ManagementSettingsPage/OrganizationMembersPage"),
Expand Down
Loading