Merge branch 'main' into org-groups

coder · aslilac · Jul 22, 2024 · Jul 12, 2024 · Jul 17, 2024 · Jul 17, 2024
commit 504f5616c3e8ebb935035be59ed0d0b8331469d7
diff --git a/site/src/router.tsx b/site/src/router.tsx
@@ -239,6 +239,9 @@ const OrganizationGroupPage = lazy(
 const OrganizationGroupSettingsPage = lazy(
   () => import("./pages/ManagementSettingsPage/GroupsPage/SettingsGroupPage"),
 );
+const OrganizationMembersPage = lazy(
+  () => import("./pages/ManagementSettingsPage/OrganizationMembersPage"),
+);
 const OrganizationSettingsPlaceholder = lazy(
   () =>
     import("./pages/ManagementSettingsPage/OrganizationSettingsPlaceholder"),
@@ -356,14 +359,7 @@ export const router = createBrowserRouter(
 
             <Route path=":organization">
               <Route index element={<OrganizationSettingsPage />} />
-              <Route
-                path="external-auth"
-                element={<OrganizationSettingsPlaceholder />}
-              />
-              <Route
-                path="members"
-                element={<OrganizationSettingsPlaceholder />}
-              />
+              <Route path="members" element={<OrganizationMembersPage />} />
               <Route path="groups">
                 <Route index element={<OrganizationGroupsPage />} />
 
@@ -377,10 +373,6 @@ export const router = createBrowserRouter(
                   element={<OrganizationGroupSettingsPage />}
                 />
               </Route>
-              <Route
-                path="metrics"
-                element={<OrganizationSettingsPlaceholder />}
-              />
               <Route
                 path="auditing"
                 element={<OrganizationSettingsPlaceholder />}