fix a bunch of stuff

aslilac · aslilac · commit 46cb3c7c60e4 · 2024-07-17T18:36:39.000Z
diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/CreateGroupPage.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/CreateGroupPage.tsx
@@ -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}
diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/GroupPage.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/GroupPage.tsx
@@ -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."));
             }
diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPage.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPage.tsx
@@ -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;
@@ -48,7 +48,7 @@ export const SettingsGroupPage: FC = () => {
     <>
       {helmet}
 
-      <SettingsGroupPageView
+      <GroupSettingsPageView
         onCancel={navigateToGroup}
         onSubmit={async (data) => {
           try {
@@ -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"));
           }
@@ -71,4 +71,4 @@ export const SettingsGroupPage: FC = () => {
     </>
   );
 };
-export default SettingsGroupPage;
+export default GroupSettingsPage;
diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPageView.stories.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPageView.stories.tsx
@@ -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,
@@ -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 };
diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPageView.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/GroupSettingsPageView.tsx
@@ -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
@@ -120,7 +117,7 @@ export type SettingsGroupPageViewProps = {
   isUpdating: boolean;
 };
 
-export const SettingsGroupPageView: FC<SettingsGroupPageViewProps> = ({
+const GroupSettingsPageView: FC<SettingsGroupPageViewProps> = ({
   onCancel,
   onSubmit,
   group,
@@ -145,4 +142,4 @@ export const SettingsGroupPageView: FC<SettingsGroupPageViewProps> = ({
   );
 };
 
-export default SettingsGroupPageView;
+export default GroupSettingsPageView;
diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx
@@ -13,13 +13,14 @@ import { useDashboard } from "modules/dashboard/useDashboard";
 import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
 import { pageTitle } from "utils/page";
 import GroupsPageView from "./GroupsPageView";
+import { useOrganizationSettings } from "../ManagementSettingsLayout";
 
 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) {
diff --git a/site/src/pages/ManagementSettingsPage/Sidebar.tsx b/site/src/pages/ManagementSettingsPage/Sidebar.tsx
@@ -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")}
           >
diff --git a/site/src/router.tsx b/site/src/router.tsx
@@ -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"),

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ export const GroupPage: FC = () => {`
`212`	`212`	`try {`
`213`	`213`	`await deleteGroupMutation.mutateAsync(groupId);`
`214`	`214`	`displaySuccess("Group deleted successfully.");`
`215`		`- navigate("/groups");`
	`215`	`+ navigate("..");`
`216`	`216`	`} catch (error) {`
`217`	`217`	`displayError(getErrorMessage(error, "Failed to delete group."));`
`218`	`218`	`}`