+ {header}
{(roles.data ?? []).length === 0 ? (
} title="No roles yet">
diff --git a/SW.Bitween.Web/ClientApp/src/pages/team/TeamPage.tsx b/SW.Bitween.Web/ClientApp/src/pages/team/TeamPage.tsx
deleted file mode 100644
index 46a6b722..00000000
--- a/SW.Bitween.Web/ClientApp/src/pages/team/TeamPage.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Navigate, NavLink, Outlet } from "react-router";
-import { useSession } from "../../auth/SessionContext";
-import { AccessDenied } from "../../auth/guards";
-import { PageHeader } from "../../components/layout/PageHeader";
-
-/**
- * One place for everything people-related: who can sign in (Members)
- * and what they're allowed to do (Roles). Tabs are URL paths so every
- * view is linkable.
- */
-export function TeamPage() {
- const { can } = useSession();
- const canMembers = can("users.view");
- const canRoles = can("roles.view");
-
- if (!canMembers && !canRoles) return
;
-
- const tabs = [
- ...(canMembers ? [{ to: "/team/members", label: "Members" }] : []),
- ...(canRoles ? [{ to: "/team/roles", label: "Roles" }] : []),
- ];
-
- return (
-
-
-
- Every member holds one or more roles, and every role is a list of{" "}
- permissions — page by page, action by action. A member can do
- something if any of their roles allows it; everything else is hidden from them.
-
-
- To bring someone in: create or pick a role on the Roles tab, then add them from the
- Members tab. You set their first password and pass it on — Bitween doesn't send mail.
-
-
- ),
- }}
- />
-
-
- {tabs.map((tab) => (
-
- `-mb-px border-b-2 px-3.5 py-2 text-sm font-medium transition-colors ${
- isActive
- ? "border-crimson-600 text-crimson-700"
- : "border-transparent text-ink-500 hover:border-ink-300 hover:text-ink-800"
- }`
- }
- >
- {tab.label}
-
- ))}
-
-
-
-
- );
-}
-
-export function TeamIndexRedirect() {
- const { can } = useSession();
- return
;
-}
diff --git a/SW.Bitween.Web/ClientApp/src/router.tsx b/SW.Bitween.Web/ClientApp/src/router.tsx
index 6dd49bd5..6a487179 100644
--- a/SW.Bitween.Web/ClientApp/src/router.tsx
+++ b/SW.Bitween.Web/ClientApp/src/router.tsx
@@ -43,10 +43,9 @@ import { AggregationsPage } from "./pages/aggregations/AggregationsPage";
import { NewAggregationPage } from "./pages/aggregations/NewAggregationPage";
import { RetryPoliciesPage } from "./pages/retry-policies/RetryPoliciesPage";
import { RetryPolicyPage } from "./pages/retry-policies/RetryPolicyPage";
-import { MembersTab } from "./pages/team/MembersTab";
+import { MembersPage } from "./pages/team/MembersPage";
import { RoleEditor } from "./pages/team/RoleEditor";
-import { RolesTab } from "./pages/team/RolesTab";
-import { TeamIndexRedirect, TeamPage } from "./pages/team/TeamPage";
+import { RolesPage } from "./pages/team/RolesPage";
import { WorkGroupPage } from "./pages/work-groups/WorkGroupPage";
import { WorkGroupsPage } from "./pages/work-groups/WorkGroupsPage";
@@ -57,6 +56,12 @@ function HomeRedirect() {
return
;
}
+/** An old "/team" link lands on whichever of the two pages this session can open. */
+function TeamRedirect() {
+ const { can } = useSession();
+ return
;
+}
+
const placeholderRoutes = NAV_GROUPS.flatMap((group) => group.items)
.filter((item) => item.planned)
.map((item) => ({
@@ -117,36 +122,32 @@ export const router = createBrowserRouter([
),
},
+ // Members and Roles are two sidebar entries, not tabs inside a "Team" page, so
+ // "/team" itself is no longer a page — only a bookmark people may still hold.
+ { path: "team", element:
},
+ {
+ path: "team/members",
+ element: (
+
+
+
+ ),
+ },
+ {
+ path: "team/members/:id",
+ element: (
+
+
+
+ ),
+ },
{
- path: "team",
- element:
,
- children: [
- { index: true, element:
},
- {
- path: "members",
- element: (
-
-
-
- ),
- },
- {
- path: "members/:id",
- element: (
-
-
-
- ),
- },
- {
- path: "roles",
- element: (
-
-
-
- ),
- },
- ],
+ path: "team/roles",
+ element: (
+
+
+
+ ),
},
{
path: "team/roles/new",