History

rename /team to /org and standardize Organization naming (#197)

- Rename route file team.tsx → org.tsx (route /team → /org) - Rename team/ directory → org/ (api.ts, compose.ts, handlers.ts, handlers.test.ts) - Rename team-atoms.ts → org-atoms.ts - Rename all types/exports: TeamApi → OrgApi, TeamHandlers → OrgHandlers, TeamPage → OrgPage, etc. - Rename API routes: /api/team/* → /api/org/* - Update all user-facing strings from "Team" to "Organization" - Update test file to match new naming

Rhys Sullivan committed 7 months ago

Commit 857a8541 parent 5c2df5115 files · +145 −145Browse files

Unified · Split

15 files
  1. apps/cloud/src/api.test.ts +14 −14
  2. apps/cloud/src/api.ts +3 −3
  3. apps/cloud/src/api/layers.ts +7 −7
  4. apps/cloud/src/api/router.ts +5 −5
  5. apps/cloud/src/org/api.ts +23 −23
  6. apps/cloud/src/org/compose.ts +6 −0
  7. apps/cloud/src/org/handlers.test.ts +1 −1
  8. apps/cloud/src/org/handlers.ts +4 −4
  9. apps/cloud/src/routeTree.gen.ts +21 −21
  10. apps/cloud/src/routes/org.tsx +26 −26
  11. apps/cloud/src/team/compose.ts +0 −6
  12. apps/cloud/src/web/client.tsx +3 −3
  13. apps/cloud/src/web/org-atoms.ts +30 −0
  14. apps/cloud/src/web/shell.tsx +2 −2
  15. apps/cloud/src/web/team-atoms.ts +0 −30
apps/cloud/src/api.test.ts+14−14
@@ -18,17 +18,17 @@ import { · 17 unmodified lines
1818 AutumnRequestHandlerService,
1919 NonProtectedRequestHandlerService,
2020 ProtectedRequestHandlerService,
21− TeamRequestHandlerService,
21+ OrgRequestHandlerService,
2222 } from "./api/router";
2323
2424 const SourceResponse = Schema.Struct({ source: Schema.String });
2525
26−const TeamGroup = HttpApiGroup.make("team").add(
27− HttpApiEndpoint.get("ping", "/team/ping").addSuccess(SourceResponse),
26+const OrgGroup = HttpApiGroup.make("org").add(
27+ HttpApiEndpoint.get("ping", "/org/ping").addSuccess(SourceResponse),
2828 );
29−const TeamApi = HttpApi.make("teamApi").add(TeamGroup);
30−const TeamHandlers = HttpApiBuilder.group(TeamApi, "team", (handlers) =>
31− handlers.handle("ping", () => Effect.succeed({ source: "team" })),
29+const OrgTestApi = HttpApi.make("orgApi").add(OrgGroup);
30+const OrgTestHandlers = HttpApiBuilder.group(OrgTestApi, "org", (handlers) =>
31+ handlers.handle("ping", () => Effect.succeed({ source: "org" })),
3232 );
3333
3434 const AuthGroup = HttpApiGroup.make("auth").add(
@@ -53,11 +53,11 @@ const ProtectedHandlers = HttpApiBuilder.group(ProtectedApi, "protected", (handl · 18 unmodified lines
5353 .handle("resume", () => Effect.succeed({ source: "protected" })),
5454 );
5555
56−const TeamTestApp = Effect.flatMap(
56+const OrgTestApp = Effect.flatMap(
5757 HttpApiBuilder.httpApp.pipe(
5858 Effect.provide(
59− HttpApiBuilder.api(TeamApi).pipe(
60− Layer.provide(TeamHandlers),
59+ HttpApiBuilder.api(OrgTestApi).pipe(
60+ Layer.provide(OrgTestHandlers),
6161 Layer.provideMerge(HttpServer.layerContext),
6262 Layer.provideMerge(HttpApiBuilder.Router.Live),
6363 Layer.provideMerge(HttpApiBuilder.Middleware.layer),
@@ -124,7 +124,7 @@ const ProtectedTestApp = Effect.gen(function* () { · 60 unmodified lines
124124 });
125125
126126 const TestRequestHandlersLive = Layer.mergeAll(
127− Layer.succeed(TeamRequestHandlerService, { app: TeamTestApp }),
127+ Layer.succeed(OrgRequestHandlerService, { app: OrgTestApp }),
128128 Layer.succeed(NonProtectedRequestHandlerService, { app: AuthTestApp }),
129129 Layer.succeed(AutumnRequestHandlerService, {
130130 app: Effect.succeed(HttpServerResponse.unsafeJson({ source: "autumn" })),
@@ -135,7 +135,7 @@ const TestRequestHandlersLive = Layer.mergeAll( · 4 unmodified lines
135135 const requestHandler = Effect.runSync(Effect.provide(ApiRequestHandler, TestRequestHandlersLive));
136136
137137 const TestApi = HttpApi.make("testApi")
138− .add(TeamGroup)
138+ .add(OrgGroup)
139139 .add(AuthGroup)
140140 .add(
141141 HttpApiGroup.make("autumn").add(
@@ -151,12 +151,12 @@ const TestServerLayer = HttpServer.serve(HttpApp.fromWebHandler(requestHandler)) · 9 unmodified lines
151151 const getClient = () => HttpApiClient.make(TestApi);
152152
153153 layer(TestServerLayer)("handleApiRequest", (it) => {
154− it.effect("routes /team/* to the team API handler", () =>
154+ it.effect("routes /org/* to the org API handler", () =>
155155 Effect.gen(function* () {
156156 resetState();
157157 const client = yield* getClient();
158− const result = yield* client.team.ping();
159− expect(result).toEqual({ source: "team" });
158+ const result = yield* client.org.ping();
159+ expect(result).toEqual({ source: "org" });
160160 }),
161161 );
162162
apps/cloud/src/api.ts+3−3
@@ -1,17 +1,17 @@
11 import { Effect, Layer } from "effect";
22 import { AutumnApiApp } from "./api/autumn";
3−import { NonProtectedApiApp, TeamApiApp } from "./api/layers";
3+import { NonProtectedApiApp, OrgApiApp } from "./api/layers";
44 import { ProtectedApiApp } from "./api/protected";
55 import {
66 ApiRequestHandler,
77 AutumnRequestHandlerService,
88 NonProtectedRequestHandlerService,
99 ProtectedRequestHandlerService,
10− TeamRequestHandlerService,
10+ OrgRequestHandlerService,
1111 } from "./api/router";
1212
1313 const ApiRequestHandlersLive = Layer.mergeAll(
14− Layer.succeed(TeamRequestHandlerService, { app: TeamApiApp }),
14+ Layer.succeed(OrgRequestHandlerService, { app: OrgApiApp }),
1515 Layer.succeed(NonProtectedRequestHandlerService, { app: NonProtectedApiApp }),
1616 Layer.succeed(AutumnRequestHandlerService, { app: AutumnApiApp }),
1717 Layer.succeed(ProtectedRequestHandlerService, { app: ProtectedApiApp }),
apps/cloud/src/api/layers.ts+7−7
@@ -22,8 +22,8 @@ import { · 21 unmodified lines
2222 import { WorkOSAuth } from "../auth/workos";
2323 import { AutumnService } from "../services/autumn";
2424 import { DbService } from "../services/db";
25−import { TeamOrgApi } from "../team/compose";
26−import { TeamHandlers } from "../team/handlers";
25+import { OrgHttpApi } from "../org/compose";
26+import { OrgHandlers } from "../org/handlers";
2727
2828 const ProtectedCloudApi = CoreExecutorApi.add(OpenApiGroup)
2929 .add(McpGroup)
@@ -62,8 +62,8 @@ const NonProtectedApiLive = HttpApiBuilder.api(NonProtectedApi).pipe( · 32 unmodified lines
6262 Layer.provideMerge(SessionAuthLive),
6363 );
6464
65−const TeamApiLive = HttpApiBuilder.api(TeamOrgApi).pipe(
66− Layer.provide(TeamHandlers),
65+const OrgApiLive = HttpApiBuilder.api(OrgHttpApi).pipe(
66+ Layer.provide(OrgHandlers),
6767 Layer.provideMerge(OrgAuthLive),
6868 );
6969
@@ -74,7 +74,7 @@ const NonProtectedRequestLayer = NonProtectedApiLive.pipe( · 4 unmodified lines
7474 Layer.provideMerge(HttpApiBuilder.Middleware.layer),
7575 );
7676
77−const TeamRequestLayer = TeamApiLive.pipe(
77+const OrgRequestLayer = OrgApiLive.pipe(
7878 Layer.provideMerge(RouterConfig),
7979 Layer.provideMerge(HttpServer.layerContext),
8080 Layer.provideMerge(HttpApiBuilder.Router.Live),
@@ -86,7 +86,7 @@ export const NonProtectedApiApp = Effect.flatMap( · 5 unmodified lines
8686 HttpMiddleware.logger,
8787 ).pipe(Effect.provide(SharedServices));
8888
89−export const TeamApiApp = Effect.flatMap(
90− HttpApiBuilder.httpApp.pipe(Effect.provide(TeamRequestLayer)),
89+export const OrgApiApp = Effect.flatMap(
90+ HttpApiBuilder.httpApp.pipe(Effect.provide(OrgRequestLayer)),
9191 HttpMiddleware.logger,
9292 ).pipe(Effect.provide(SharedServices));
apps/cloud/src/api/router.ts+5−5
@@ -5,9 +5,9 @@ type RequestAppService = { · 4 unmodified lines
55 readonly app: HttpApp.Default;
66 };
77
8−export class TeamRequestHandlerService extends Context.Tag(
9− "@executor/cloud/TeamRequestHandlerService",
10−)<TeamRequestHandlerService, RequestAppService>() {}
8+export class OrgRequestHandlerService extends Context.Tag(
9+ "@executor/cloud/OrgRequestHandlerService",
10+)<OrgRequestHandlerService, RequestAppService>() {}
1111
1212 export class NonProtectedRequestHandlerService extends Context.Tag(
1313 "@executor/cloud/NonProtectedRequestHandlerService",
@@ -22,13 +22,13 @@ export class ProtectedRequestHandlerService extends Context.Tag( · 8 unmodified lines
2222 )<ProtectedRequestHandlerService, RequestAppService>() {}
2323
2424 export const ApiRouterApp = Effect.gen(function* () {
25− const team = yield* TeamRequestHandlerService;
25+ const org = yield* OrgRequestHandlerService;
2626 const nonProtected = yield* NonProtectedRequestHandlerService;
2727 const autumn = yield* AutumnRequestHandlerService;
2828 const protectedHandler = yield* ProtectedRequestHandlerService;
2929
3030 return yield* HttpRouter.empty.pipe(
31− HttpRouter.mountApp("/team", team.app, { includePrefix: true }),
31+ HttpRouter.mountApp("/org", org.app, { includePrefix: true }),
3232 HttpRouter.mountApp("/auth", nonProtected.app, { includePrefix: true }),
3333 HttpRouter.mountApp("/autumn", autumn.app, { includePrefix: true }),
3434 HttpRouter.mountApp("/", protectedHandler.app),
apps/cloud/src/org/api.tsrenamed from apps/cloud/src/team/api.ts+23−23
@@ -8,7 +8,7 @@ export class Forbidden extends Schema.TaggedError<Forbidden>()( · 7 unmodified lines
88 HttpApiSchema.annotations({ status: 403 }),
99 ) {}
1010
11−const TeamMember = Schema.Struct({
11+const OrgMember = Schema.Struct({
1212 id: Schema.String,
1313 userId: Schema.String,
1414 email: Schema.String,
@@ -20,17 +20,17 @@ const TeamMember = Schema.Struct({ · 5 unmodified lines
2020 isCurrentUser: Schema.Boolean,
2121 });
2222
23−const TeamMembersResponse = Schema.Struct({
24− members: Schema.Array(TeamMember),
23+const OrgMembersResponse = Schema.Struct({
24+ members: Schema.Array(OrgMember),
2525 });
2626
27−const TeamRole = Schema.Struct({
27+const OrgRole = Schema.Struct({
2828 slug: Schema.String,
2929 name: Schema.String,
3030 });
3131
32−const TeamRolesResponse = Schema.Struct({
33− roles: Schema.Array(TeamRole),
32+const OrgRolesResponse = Schema.Struct({
33+ roles: Schema.Array(OrgRole),
3434 });
3535
3636 const InviteBody = Schema.Struct({
@@ -57,11 +57,11 @@ const UpdateRoleResponse = Schema.Struct({ · 20 unmodified lines
5757 success: Schema.Boolean,
5858 });
5959
60−const UpdateTeamNameBody = Schema.Struct({
60+const UpdateOrgNameBody = Schema.Struct({
6161 name: Schema.String,
6262 });
6363
64−const UpdateTeamNameResponse = Schema.Struct({
64+const UpdateOrgNameResponse = Schema.Struct({
6565 name: Schema.String,
6666 });
6767
@@ -83,60 +83,60 @@ const DomainVerificationLinkResponse = Schema.Struct({ · 15 unmodified lines
8383
8484 const domainIdParam = HttpApiSchema.param("domainId", Schema.String);
8585
86−export { TeamMember, TeamMembersResponse };
86+export { OrgMember, OrgMembersResponse };
8787
88−export class TeamApi extends HttpApiGroup.make("team")
88+export class OrgApi extends HttpApiGroup.make("org")
8989 .add(
90− HttpApiEndpoint.get("listMembers")`/team/members`
91− .addSuccess(TeamMembersResponse)
90+ HttpApiEndpoint.get("listMembers")`/org/members`
91+ .addSuccess(OrgMembersResponse)
9292 .addError(WorkOSError),
9393 )
9494 .add(
95− HttpApiEndpoint.get("listRoles")`/team/roles`
96− .addSuccess(TeamRolesResponse)
95+ HttpApiEndpoint.get("listRoles")`/org/roles`
96+ .addSuccess(OrgRolesResponse)
9797 .addError(WorkOSError),
9898 )
9999 .add(
100− HttpApiEndpoint.post("invite")`/team/invite`
100+ HttpApiEndpoint.post("invite")`/org/invite`
101101 .setPayload(InviteBody)
102102 .addSuccess(InviteResponse)
103103 .addError(WorkOSError)
104104 .addError(Forbidden),
105105 )
106106 .add(
107− HttpApiEndpoint.del("removeMember")`/team/members/${membershipIdParam}`
107+ HttpApiEndpoint.del("removeMember")`/org/members/${membershipIdParam}`
108108 .addSuccess(RemoveResponse)
109109 .addError(WorkOSError)
110110 .addError(Forbidden),
111111 )
112112 .add(
113− HttpApiEndpoint.patch("updateMemberRole")`/team/members/${membershipIdParam}/role`
113+ HttpApiEndpoint.patch("updateMemberRole")`/org/members/${membershipIdParam}/role`
114114 .setPayload(UpdateRoleBody)
115115 .addSuccess(UpdateRoleResponse)
116116 .addError(WorkOSError)
117117 .addError(Forbidden),
118118 )
119119 .add(
120− HttpApiEndpoint.get("listDomains")`/team/domains`
120+ HttpApiEndpoint.get("listDomains")`/org/domains`
121121 .addSuccess(DomainsResponse)
122122 .addError(WorkOSError),
123123 )
124124 .add(
125− HttpApiEndpoint.post("getDomainVerificationLink")`/team/domains/verify-link`
125+ HttpApiEndpoint.post("getDomainVerificationLink")`/org/domains/verify-link`
126126 .addSuccess(DomainVerificationLinkResponse)
127127 .addError(WorkOSError)
128128 .addError(Forbidden),
129129 )
130130 .add(
131− HttpApiEndpoint.del("deleteDomain")`/team/domains/${domainIdParam}`
131+ HttpApiEndpoint.del("deleteDomain")`/org/domains/${domainIdParam}`
132132 .addSuccess(RemoveResponse)
133133 .addError(WorkOSError)
134134 .addError(Forbidden),
135135 )
136136 .add(
137− HttpApiEndpoint.patch("updateTeamName")`/team/name`
138− .setPayload(UpdateTeamNameBody)
139− .addSuccess(UpdateTeamNameResponse)
137+ HttpApiEndpoint.patch("updateOrgName")`/org/name`
138+ .setPayload(UpdateOrgNameBody)
139+ .addSuccess(UpdateOrgNameResponse)
140140 .addError(WorkOSError)
141141 .addError(UserStoreError)
142142 .addError(Forbidden),
apps/cloud/src/org/compose.ts+6−0
@@ -0,0 +1,6 @@
1+import { HttpApi } from "@effect/platform";
2+import { OrgAuth } from "../auth/middleware";
3+import { OrgApi } from "./api";
4+
5+/** Org API with org-level auth — requires authenticated session with an org. */
6+export const OrgHttpApi = HttpApi.make("org").add(OrgApi).middleware(OrgAuth);
apps/cloud/src/org/handlers.test.tsrenamed from apps/cloud/src/team/handlers.test.ts+1−1
@@ -131,7 +131,7 @@ const withMembers: StubOverrides = { · 130 unmodified lines
131131 // Tests
132132 // ---------------------------------------------------------------------------
133133
134−describe("Team handlers", () => {
134+describe("Org handlers", () => {
135135 describe("listMembers", () => {
136136 it.effect("returns members with isCurrentUser set correctly", () =>
137137 Effect.gen(function* () {
apps/cloud/src/org/handlers.tsrenamed from apps/cloud/src/team/handlers.ts+4−4
@@ -6,7 +6,7 @@ import { AuthContext } from "../auth/middleware"; · 5 unmodified lines
66 import { WorkOSAuth } from "../auth/workos";
77 import { server } from "../env";
88 import { AutumnService } from "../services/autumn";
9−import { TeamOrgApi } from "./compose";
9+import { OrgHttpApi } from "./compose";
1010 import { Forbidden } from "./api";
1111
1212 const requireAdmin = Effect.gen(function* () {
@@ -19,7 +19,7 @@ const requireAdmin = Effect.gen(function* () { · 6 unmodified lines
1919 }
2020 });
2121
22−export const TeamHandlers = HttpApiBuilder.group(TeamOrgApi, "team", (handlers) =>
22+export const OrgHandlers = HttpApiBuilder.group(OrgHttpApi, "org", (handlers) =>
2323 handlers
2424 .handle("listMembers", () =>
2525 Effect.gen(function* () {
@@ -144,7 +144,7 @@ export const TeamHandlers = HttpApiBuilder.group(TeamOrgApi, "team", (handlers) · 118 unmodified lines
144144 const workos = yield* WorkOSAuth;
145145 const { link } = yield* workos.generateDomainVerificationPortalLink(
146146 auth.organizationId,
147− server.VITE_PUBLIC_SITE_URL ? `${server.VITE_PUBLIC_SITE_URL}/team` : "/team",
147+ server.VITE_PUBLIC_SITE_URL ? `${server.VITE_PUBLIC_SITE_URL}/org` : "/org",
148148 );
149149 return { link };
150150 }),
@@ -157,7 +157,7 @@ export const TeamHandlers = HttpApiBuilder.group(TeamOrgApi, "team", (handlers) · 6 unmodified lines
157157 return { success: true };
158158 }),
159159 )
160− .handle("updateTeamName", ({ payload }) =>
160+ .handle("updateOrgName", ({ payload }) =>
161161 Effect.gen(function* () {
162162 yield* requireAdmin;
163163 const auth = yield* AuthContext;
apps/cloud/src/routeTree.gen.ts+21−21
@@ -10,8 +10,8 @@ · 9 unmodified lines
1010
1111 import { Route as rootRouteImport } from './routes/__root'
1212 import { Route as ToolsRouteImport } from './routes/tools'
13−import { Route as TeamRouteImport } from './routes/team'
1413 import { Route as SecretsRouteImport } from './routes/secrets'
14+import { Route as OrgRouteImport } from './routes/org'
1515 import { Route as BillingRouteImport } from './routes/billing'
1616 import { Route as IndexRouteImport } from './routes/index'
1717 import { Route as SourcesNamespaceRouteImport } from './routes/sources.$namespace'
@@ -23,16 +23,16 @@ const ToolsRoute = ToolsRouteImport.update({ · 5 unmodified lines
2323 path: '/tools',
2424 getParentRoute: () => rootRouteImport,
2525 } as any)
26−const TeamRoute = TeamRouteImport.update({
27− id: '/team',
28− path: '/team',
29− getParentRoute: () => rootRouteImport,
30−} as any)
3126 const SecretsRoute = SecretsRouteImport.update({
3227 id: '/secrets',
3328 path: '/secrets',
3429 getParentRoute: () => rootRouteImport,
3530 } as any)
31+const OrgRoute = OrgRouteImport.update({
32+ id: '/org',
33+ path: '/org',
34+ getParentRoute: () => rootRouteImport,
35+} as any)
3636 const BillingRoute = BillingRouteImport.update({
3737 id: '/billing',
3838 path: '/billing',
@@ -62,8 +62,8 @@ const SourcesAddPluginKeyRoute = SourcesAddPluginKeyRouteImport.update({ · 23 unmodified lines
6262 export interface FileRoutesByFullPath {
6363 '/': typeof IndexRoute
6464 '/billing': typeof BillingRoute
65+ '/org': typeof OrgRoute
6566 '/secrets': typeof SecretsRoute
66− '/team': typeof TeamRoute
6767 '/tools': typeof ToolsRoute
6868 '/billing/plans': typeof BillingPlansRoute
6969 '/sources/$namespace': typeof SourcesNamespaceRoute
@@ -72,8 +72,8 @@ export interface FileRoutesByFullPath { · 2 unmodified lines
7272 export interface FileRoutesByTo {
7373 '/': typeof IndexRoute
7474 '/billing': typeof BillingRoute
75+ '/org': typeof OrgRoute
7576 '/secrets': typeof SecretsRoute
76− '/team': typeof TeamRoute
7777 '/tools': typeof ToolsRoute
7878 '/billing/plans': typeof BillingPlansRoute
7979 '/sources/$namespace': typeof SourcesNamespaceRoute
@@ -83,8 +83,8 @@ export interface FileRoutesById { · 3 unmodified lines
8383 __root__: typeof rootRouteImport
8484 '/': typeof IndexRoute
8585 '/billing': typeof BillingRoute
86+ '/org': typeof OrgRoute
8687 '/secrets': typeof SecretsRoute
87− '/team': typeof TeamRoute
8888 '/tools': typeof ToolsRoute
8989 '/billing_/plans': typeof BillingPlansRoute
9090 '/sources/$namespace': typeof SourcesNamespaceRoute
@@ -95,8 +95,8 @@ export interface FileRouteTypes { · 4 unmodified lines
9595 fullPaths:
9696 | '/'
9797 | '/billing'
98+ | '/org'
9899 | '/secrets'
99− | '/team'
100100 | '/tools'
101101 | '/billing/plans'
102102 | '/sources/$namespace'
@@ -105,8 +105,8 @@ export interface FileRouteTypes { · 2 unmodified lines
105105 to:
106106 | '/'
107107 | '/billing'
108+ | '/org'
108109 | '/secrets'
109− | '/team'
110110 | '/tools'
111111 | '/billing/plans'
112112 | '/sources/$namespace'
@@ -115,8 +115,8 @@ export interface FileRouteTypes { · 2 unmodified lines
115115 | '__root__'
116116 | '/'
117117 | '/billing'
118+ | '/org'
118119 | '/secrets'
119− | '/team'
120120 | '/tools'
121121 | '/billing_/plans'
122122 | '/sources/$namespace'
@@ -126,8 +126,8 @@ export interface FileRouteTypes { · 3 unmodified lines
126126 export interface RootRouteChildren {
127127 IndexRoute: typeof IndexRoute
128128 BillingRoute: typeof BillingRoute
129+ OrgRoute: typeof OrgRoute
129130 SecretsRoute: typeof SecretsRoute
130− TeamRoute: typeof TeamRoute
131131 ToolsRoute: typeof ToolsRoute
132132 BillingPlansRoute: typeof BillingPlansRoute
133133 SourcesNamespaceRoute: typeof SourcesNamespaceRoute
@@ -143,13 +143,6 @@ declare module '@tanstack/react-router' { · 9 unmodified lines
143143 preLoaderRoute: typeof ToolsRouteImport
144144 parentRoute: typeof rootRouteImport
145145 }
146− '/team': {
147− id: '/team'
148− path: '/team'
149− fullPath: '/team'
150− preLoaderRoute: typeof TeamRouteImport
151− parentRoute: typeof rootRouteImport
152− }
153146 '/secrets': {
154147 id: '/secrets'
155148 path: '/secrets'
@@ -157,6 +150,13 @@ declare module '@tanstack/react-router' { · 1 unmodified line
157150 preLoaderRoute: typeof SecretsRouteImport
158151 parentRoute: typeof rootRouteImport
159152 }
153+ '/org': {
154+ id: '/org'
155+ path: '/org'
156+ fullPath: '/org'
157+ preLoaderRoute: typeof OrgRouteImport
158+ parentRoute: typeof rootRouteImport
159+ }
160160 '/billing': {
161161 id: '/billing'
162162 path: '/billing'
@@ -198,8 +198,8 @@ declare module '@tanstack/react-router' { · 35 unmodified lines
198198 const rootRouteChildren: RootRouteChildren = {
199199 IndexRoute: IndexRoute,
200200 BillingRoute: BillingRoute,
201+ OrgRoute: OrgRoute,
201202 SecretsRoute: SecretsRoute,
202− TeamRoute: TeamRoute,
203203 ToolsRoute: ToolsRoute,
204204 BillingPlansRoute: BillingPlansRoute,
205205 SourcesNamespaceRoute: SourcesNamespaceRoute,
apps/cloud/src/routes/org.tsxrenamed from apps/cloud/src/routes/team.tsx+26−26
@@ -36,20 +36,20 @@ import { · 35 unmodified lines
3636 DropdownMenuSeparator,
3737 } from "@executor/react/components/dropdown-menu";
3838 import {
39− teamMembersAtom,
40− teamRolesAtom,
41− teamDomainsAtom,
39+ orgMembersAtom,
40+ orgRolesAtom,
41+ orgDomainsAtom,
4242 inviteMember,
4343 removeMember,
4444 updateMemberRole,
4545 getDomainVerificationLink,
4646 deleteDomain,
47− updateTeamName,
48−} from "../web/team-atoms";
47+ updateOrgName,
48+} from "../web/org-atoms";
4949 import { authAtom, useAuth } from "../web/auth";
5050
51−export const Route = createFileRoute("/team")({
52− component: TeamPage,
51+export const Route = createFileRoute("/org")({
52+ component: OrgPage,
5353 });
5454
5555 type InviteState = {
@@ -102,20 +102,20 @@ function formatLastActive(lastActiveAt: string | null): string { · 46 unmodified lines
102102 return date.toLocaleDateString(undefined, { month: "short", day: "numeric" });
103103 }
104104
105−function TeamPage() {
105+function OrgPage() {
106106 const auth = useAuth();
107107 const orgName =
108− auth.status === "authenticated" ? (auth.organization?.name ?? "Team") : "Team";
109− const membersResult = useAtomValue(teamMembersAtom);
110− const rolesResult = useAtomValue(teamRolesAtom);
111− const domainsResult = useAtomValue(teamDomainsAtom);
112− const refreshMembers = useAtomRefresh(teamMembersAtom);
113− const refreshDomains = useAtomRefresh(teamDomainsAtom);
108+ auth.status === "authenticated" ? (auth.organization?.name ?? "Organization") : "Organization";
109+ const membersResult = useAtomValue(orgMembersAtom);
110+ const rolesResult = useAtomValue(orgRolesAtom);
111+ const domainsResult = useAtomValue(orgDomainsAtom);
112+ const refreshMembers = useAtomRefresh(orgMembersAtom);
113+ const refreshDomains = useAtomRefresh(orgDomainsAtom);
114114 const doRemove = useAtomSet(removeMember, { mode: "promiseExit" });
115115 const doUpdateRole = useAtomSet(updateMemberRole, { mode: "promiseExit" });
116116 const doDeleteDomain = useAtomSet(deleteDomain, { mode: "promiseExit" });
117117 const doGetVerificationLink = useAtomSet(getDomainVerificationLink, { mode: "promiseExit" });
118− const doUpdateTeamName = useAtomSet(updateTeamName, { mode: "promiseExit" });
118+ const doUpdateOrgName = useAtomSet(updateOrgName, { mode: "promiseExit" });
119119 const { check, isLoading: customerLoading } = useCustomer();
120120 const canUseDomains = customerLoading ? false : check({ featureId: "domain-verification" }).allowed;
121121 const [inviteOpen, setInviteOpen] = useState(false);
@@ -158,12 +158,12 @@ function TeamPage() { · 36 unmodified lines
158158 return;
159159 }
160160 setSavingName(true);
161− const exit = await doUpdateTeamName({ payload: { name: trimmed } });
161+ const exit = await doUpdateOrgName({ payload: { name: trimmed } });
162162 if (Exit.isSuccess(exit)) {
163− toast.success("Team name updated");
163+ toast.success("Organization name updated");
164164 refreshAuth();
165165 } else {
166− toast.error("Failed to update team name");
166+ toast.error("Failed to update organization name");
167167 setEditName(orgName);
168168 }
169169 setSavingName(false);
@@ -194,7 +194,7 @@ function TeamPage() { · 24 unmodified lines
194194 {/* Header */}
195195 <div className="mb-8">
196196 <h1 className="font-display text-[2rem] tracking-tight text-foreground">
197− Team
197+ Organization
198198 </h1>
199199 </div>
200200
@@ -203,13 +203,13 @@ function TeamPage() { · 2 unmodified lines
203203 <div className="flex items-end gap-3">
204204 <div className="min-w-0 flex-1">
205205 <Label
206− htmlFor="team-name"
206+ htmlFor="org-name"
207207 className="text-sm font-medium text-foreground"
208208 >
209− Team name
209+ Organization name
210210 </Label>
211211 <Input
212− id="team-name"
212+ id="org-name"
213213 value={editName}
214214 onChange={(e) => setEditName((e.target as HTMLInputElement).value)}
215215 onKeyDown={(e) => {
@@ -275,7 +275,7 @@ function TeamPage() { · 59 unmodified lines
275275 if (value.domains.length === 0) {
276276 return (
277277 <p className="py-6 text-center text-sm text-muted-foreground">
278− No domains yet. Add your company domain so teammates can join without an invite.
278+ No domains yet. Add your company domain so members can join without an invite.
279279 </p>
280280 );
281281 }
@@ -321,7 +321,7 @@ function TeamPage() { · 39 unmodified lines
321321 ),
322322 onFailure: () => (
323323 <div className="rounded-lg border border-destructive/30 bg-destructive/5 px-4 py-3">
324− <p className="text-sm text-destructive">Failed to load team members</p>
324+ <p className="text-sm text-destructive">Failed to load members</p>
325325 </div>
326326 ),
327327 onSuccess: ({ value }) => {
@@ -337,7 +337,7 @@ function TeamPage() { · 9 unmodified lines
337337 if (filtered.length === 0) {
338338 return (
339339 <p className="py-8 text-center text-sm text-muted-foreground">
340− {search ? "No matching members" : "No team members yet"}
340+ {search ? "No matching members" : "No members yet"}
341341 </p>
342342 );
343343 }
@@ -619,7 +619,7 @@ function InviteDialog(props: { · 275 unmodified lines
619619 <DialogHeader>
620620 <DialogTitle className="font-display text-xl">Invite member</DialogTitle>
621621 <DialogDescription className="text-[0.8125rem] leading-relaxed">
622− Send an email invitation to join your team.
622+ Send an email invitation to join your organization.
623623 </DialogDescription>
624624 </DialogHeader>
625625
apps/cloud/src/team/compose.ts+0−6
@@ -1,6 +0,0 @@
1−import { HttpApi } from "@effect/platform";
2−import { OrgAuth } from "../auth/middleware";
3−import { TeamApi } from "./api";
4−
5−/** Team API with org-level auth — requires authenticated session with an org. */
6−export const TeamOrgApi = HttpApi.make("teamOrg").add(TeamApi).middleware(OrgAuth);
apps/cloud/src/web/client.tsx+3−3
@@ -3,13 +3,13 @@ import { FetchHttpClient } from "@effect/platform"; · 2 unmodified lines
33 import { addGroup } from "@executor/api";
44 import { getBaseUrl } from "@executor/react/api/base-url";
55 import { CloudAuthApi } from "../auth/api";
6−import { TeamApi } from "../team/api";
6+import { OrgApi } from "../org/api";
77
88 // ---------------------------------------------------------------------------
9−// Cloud API client — core API + cloud auth + team
9+// Cloud API client — core API + cloud auth + org
1010 // ---------------------------------------------------------------------------
1111
12−const CloudApi = addGroup(CloudAuthApi).add(TeamApi);
12+const CloudApi = addGroup(CloudAuthApi).add(OrgApi);
1313
1414 class CloudApiClient extends AtomHttpApi.Tag<CloudApiClient>()("CloudApiClient", {
1515 api: CloudApi,
apps/cloud/src/web/org-atoms.ts+30−0
@@ -0,0 +1,30 @@
1+import { Atom } from "@effect-atom/atom";
2+import { CloudApiClient } from "./client";
3+
4+export const orgMembersAtom = Atom.refreshOnWindowFocus(
5+ CloudApiClient.query("org", "listMembers", {
6+ timeToLive: "30 seconds",
7+ }),
8+);
9+
10+export const orgRolesAtom = CloudApiClient.query("org", "listRoles", {
11+ timeToLive: "5 minutes",
12+});
13+
14+export const inviteMember = CloudApiClient.mutation("org", "invite");
15+
16+export const removeMember = CloudApiClient.mutation("org", "removeMember");
17+
18+export const updateMemberRole = CloudApiClient.mutation("org", "updateMemberRole");
19+
20+export const orgDomainsAtom = Atom.refreshOnWindowFocus(
21+ CloudApiClient.query("org", "listDomains", {
22+ timeToLive: "30 seconds",
23+ }),
24+);
25+
26+export const getDomainVerificationLink = CloudApiClient.mutation("org", "getDomainVerificationLink");
27+
28+export const deleteDomain = CloudApiClient.mutation("org", "deleteDomain");
29+
30+export const updateOrgName = CloudApiClient.mutation("org", "updateOrgName");
apps/cloud/src/web/shell.tsx+2−2
@@ -152,7 +152,7 @@ function SidebarContent(props: { pathname: string; onNavigate?: () => void; show · 151 unmodified lines
152152 const isHome = props.pathname === "/";
153153 const isSecrets = props.pathname === "/secrets";
154154 const isBilling = props.pathname === "/billing" || props.pathname.startsWith("/billing/");
155− const isTeam = props.pathname === "/team";
155+ const isOrg = props.pathname === "/org";
156156
157157 return (
158158 <>
@@ -167,7 +167,7 @@ function SidebarContent(props: { pathname: string; onNavigate?: () => void; show · 8 unmodified lines
167167 <nav className="flex flex-1 flex-col overflow-y-auto p-2">
168168 <NavItem to="/" label="Sources" active={isHome} onNavigate={props.onNavigate} />
169169 <NavItem to="/secrets" label="Secrets" active={isSecrets} onNavigate={props.onNavigate} />
170− <NavItem to="/team" label="Team" active={isTeam} onNavigate={props.onNavigate} />
170+ <NavItem to="/org" label="Organization" active={isOrg} onNavigate={props.onNavigate} />
171171 <NavItem to="/billing" label="Billing" active={isBilling} onNavigate={props.onNavigate} />
172172
173173 <div className="mt-5 mb-1 px-2.5 text-[10px] font-medium uppercase tracking-widest text-muted-foreground/50">
apps/cloud/src/web/team-atoms.ts+0−30
@@ -1,30 +0,0 @@
1−import { Atom } from "@effect-atom/atom";
2−import { CloudApiClient } from "./client";
3−
4−export const teamMembersAtom = Atom.refreshOnWindowFocus(
5− CloudApiClient.query("team", "listMembers", {
6− timeToLive: "30 seconds",
7− }),
8−);
9−
10−export const teamRolesAtom = CloudApiClient.query("team", "listRoles", {
11− timeToLive: "5 minutes",
12−});
13−
14−export const inviteMember = CloudApiClient.mutation("team", "invite");
15−
16−export const removeMember = CloudApiClient.mutation("team", "removeMember");
17−
18−export const updateMemberRole = CloudApiClient.mutation("team", "updateMemberRole");
19−
20−export const teamDomainsAtom = Atom.refreshOnWindowFocus(
21− CloudApiClient.query("team", "listDomains", {
22− timeToLive: "30 seconds",
23− }),
24−);
25−
26−export const getDomainVerificationLink = CloudApiClient.mutation("team", "getDomainVerificationLink");
27−
28−export const deleteDomain = CloudApiClient.mutation("team", "deleteDomain");
29−
30−export const updateTeamName = CloudApiClient.mutation("team", "updateTeamName");

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t