- 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
Unified · Split
| @@ -18,17 +18,17 @@ import { · 17 unmodified lines | ||
| 18 | 18 | AutumnRequestHandlerService, |
| 19 | 19 | NonProtectedRequestHandlerService, |
| 20 | 20 | ProtectedRequestHandlerService, |
| 21 | − TeamRequestHandlerService, | |
| 21 | + OrgRequestHandlerService, | |
| 22 | 22 | } from "./api/router"; |
| 23 | 23 | |
| 24 | 24 | const SourceResponse = Schema.Struct({ source: Schema.String }); |
| 25 | 25 | |
| 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), | |
| 28 | 28 | ); |
| 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" })), | |
| 32 | 32 | ); |
| 33 | 33 | |
| 34 | 34 | const AuthGroup = HttpApiGroup.make("auth").add( |
| @@ -53,11 +53,11 @@ const ProtectedHandlers = HttpApiBuilder.group(ProtectedApi, "protected", (handl · 18 unmodified lines | ||
| 53 | 53 | .handle("resume", () => Effect.succeed({ source: "protected" })), |
| 54 | 54 | ); |
| 55 | 55 | |
| 56 | −const TeamTestApp = Effect.flatMap( | |
| 56 | +const OrgTestApp = Effect.flatMap( | |
| 57 | 57 | HttpApiBuilder.httpApp.pipe( |
| 58 | 58 | Effect.provide( |
| 59 | − HttpApiBuilder.api(TeamApi).pipe( | |
| 60 | − Layer.provide(TeamHandlers), | |
| 59 | + HttpApiBuilder.api(OrgTestApi).pipe( | |
| 60 | + Layer.provide(OrgTestHandlers), | |
| 61 | 61 | Layer.provideMerge(HttpServer.layerContext), |
| 62 | 62 | Layer.provideMerge(HttpApiBuilder.Router.Live), |
| 63 | 63 | Layer.provideMerge(HttpApiBuilder.Middleware.layer), |
| @@ -124,7 +124,7 @@ const ProtectedTestApp = Effect.gen(function* () { · 60 unmodified lines | ||
| 124 | 124 | }); |
| 125 | 125 | |
| 126 | 126 | const TestRequestHandlersLive = Layer.mergeAll( |
| 127 | − Layer.succeed(TeamRequestHandlerService, { app: TeamTestApp }), | |
| 127 | + Layer.succeed(OrgRequestHandlerService, { app: OrgTestApp }), | |
| 128 | 128 | Layer.succeed(NonProtectedRequestHandlerService, { app: AuthTestApp }), |
| 129 | 129 | Layer.succeed(AutumnRequestHandlerService, { |
| 130 | 130 | app: Effect.succeed(HttpServerResponse.unsafeJson({ source: "autumn" })), |
| @@ -135,7 +135,7 @@ const TestRequestHandlersLive = Layer.mergeAll( · 4 unmodified lines | ||
| 135 | 135 | const requestHandler = Effect.runSync(Effect.provide(ApiRequestHandler, TestRequestHandlersLive)); |
| 136 | 136 | |
| 137 | 137 | const TestApi = HttpApi.make("testApi") |
| 138 | − .add(TeamGroup) | |
| 138 | + .add(OrgGroup) | |
| 139 | 139 | .add(AuthGroup) |
| 140 | 140 | .add( |
| 141 | 141 | HttpApiGroup.make("autumn").add( |
| @@ -151,12 +151,12 @@ const TestServerLayer = HttpServer.serve(HttpApp.fromWebHandler(requestHandler)) · 9 unmodified lines | ||
| 151 | 151 | const getClient = () => HttpApiClient.make(TestApi); |
| 152 | 152 | |
| 153 | 153 | layer(TestServerLayer)("handleApiRequest", (it) => { |
| 154 | − it.effect("routes /team/* to the team API handler", () => | |
| 154 | + it.effect("routes /org/* to the org API handler", () => | |
| 155 | 155 | Effect.gen(function* () { |
| 156 | 156 | resetState(); |
| 157 | 157 | 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" }); | |
| 160 | 160 | }), |
| 161 | 161 | ); |
| 162 | 162 | |
| @@ -1,17 +1,17 @@ | ||
| 1 | 1 | import { Effect, Layer } from "effect"; |
| 2 | 2 | import { AutumnApiApp } from "./api/autumn"; |
| 3 | −import { NonProtectedApiApp, TeamApiApp } from "./api/layers"; | |
| 3 | +import { NonProtectedApiApp, OrgApiApp } from "./api/layers"; | |
| 4 | 4 | import { ProtectedApiApp } from "./api/protected"; |
| 5 | 5 | import { |
| 6 | 6 | ApiRequestHandler, |
| 7 | 7 | AutumnRequestHandlerService, |
| 8 | 8 | NonProtectedRequestHandlerService, |
| 9 | 9 | ProtectedRequestHandlerService, |
| 10 | − TeamRequestHandlerService, | |
| 10 | + OrgRequestHandlerService, | |
| 11 | 11 | } from "./api/router"; |
| 12 | 12 | |
| 13 | 13 | const ApiRequestHandlersLive = Layer.mergeAll( |
| 14 | − Layer.succeed(TeamRequestHandlerService, { app: TeamApiApp }), | |
| 14 | + Layer.succeed(OrgRequestHandlerService, { app: OrgApiApp }), | |
| 15 | 15 | Layer.succeed(NonProtectedRequestHandlerService, { app: NonProtectedApiApp }), |
| 16 | 16 | Layer.succeed(AutumnRequestHandlerService, { app: AutumnApiApp }), |
| 17 | 17 | Layer.succeed(ProtectedRequestHandlerService, { app: ProtectedApiApp }), |
| @@ -22,8 +22,8 @@ import { · 21 unmodified lines | ||
| 22 | 22 | import { WorkOSAuth } from "../auth/workos"; |
| 23 | 23 | import { AutumnService } from "../services/autumn"; |
| 24 | 24 | 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"; | |
| 27 | 27 | |
| 28 | 28 | const ProtectedCloudApi = CoreExecutorApi.add(OpenApiGroup) |
| 29 | 29 | .add(McpGroup) |
| @@ -62,8 +62,8 @@ const NonProtectedApiLive = HttpApiBuilder.api(NonProtectedApi).pipe( · 32 unmodified lines | ||
| 62 | 62 | Layer.provideMerge(SessionAuthLive), |
| 63 | 63 | ); |
| 64 | 64 | |
| 65 | −const TeamApiLive = HttpApiBuilder.api(TeamOrgApi).pipe( | |
| 66 | − Layer.provide(TeamHandlers), | |
| 65 | +const OrgApiLive = HttpApiBuilder.api(OrgHttpApi).pipe( | |
| 66 | + Layer.provide(OrgHandlers), | |
| 67 | 67 | Layer.provideMerge(OrgAuthLive), |
| 68 | 68 | ); |
| 69 | 69 | |
| @@ -74,7 +74,7 @@ const NonProtectedRequestLayer = NonProtectedApiLive.pipe( · 4 unmodified lines | ||
| 74 | 74 | Layer.provideMerge(HttpApiBuilder.Middleware.layer), |
| 75 | 75 | ); |
| 76 | 76 | |
| 77 | −const TeamRequestLayer = TeamApiLive.pipe( | |
| 77 | +const OrgRequestLayer = OrgApiLive.pipe( | |
| 78 | 78 | Layer.provideMerge(RouterConfig), |
| 79 | 79 | Layer.provideMerge(HttpServer.layerContext), |
| 80 | 80 | Layer.provideMerge(HttpApiBuilder.Router.Live), |
| @@ -86,7 +86,7 @@ export const NonProtectedApiApp = Effect.flatMap( · 5 unmodified lines | ||
| 86 | 86 | HttpMiddleware.logger, |
| 87 | 87 | ).pipe(Effect.provide(SharedServices)); |
| 88 | 88 | |
| 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)), | |
| 91 | 91 | HttpMiddleware.logger, |
| 92 | 92 | ).pipe(Effect.provide(SharedServices)); |
| @@ -5,9 +5,9 @@ type RequestAppService = { · 4 unmodified lines | ||
| 5 | 5 | readonly app: HttpApp.Default; |
| 6 | 6 | }; |
| 7 | 7 | |
| 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>() {} | |
| 11 | 11 | |
| 12 | 12 | export class NonProtectedRequestHandlerService extends Context.Tag( |
| 13 | 13 | "@executor/cloud/NonProtectedRequestHandlerService", |
| @@ -22,13 +22,13 @@ export class ProtectedRequestHandlerService extends Context.Tag( · 8 unmodified lines | ||
| 22 | 22 | )<ProtectedRequestHandlerService, RequestAppService>() {} |
| 23 | 23 | |
| 24 | 24 | export const ApiRouterApp = Effect.gen(function* () { |
| 25 | − const team = yield* TeamRequestHandlerService; | |
| 25 | + const org = yield* OrgRequestHandlerService; | |
| 26 | 26 | const nonProtected = yield* NonProtectedRequestHandlerService; |
| 27 | 27 | const autumn = yield* AutumnRequestHandlerService; |
| 28 | 28 | const protectedHandler = yield* ProtectedRequestHandlerService; |
| 29 | 29 | |
| 30 | 30 | return yield* HttpRouter.empty.pipe( |
| 31 | − HttpRouter.mountApp("/team", team.app, { includePrefix: true }), | |
| 31 | + HttpRouter.mountApp("/org", org.app, { includePrefix: true }), | |
| 32 | 32 | HttpRouter.mountApp("/auth", nonProtected.app, { includePrefix: true }), |
| 33 | 33 | HttpRouter.mountApp("/autumn", autumn.app, { includePrefix: true }), |
| 34 | 34 | HttpRouter.mountApp("/", protectedHandler.app), |
| @@ -8,7 +8,7 @@ export class Forbidden extends Schema.TaggedError<Forbidden>()( · 7 unmodified lines | ||
| 8 | 8 | HttpApiSchema.annotations({ status: 403 }), |
| 9 | 9 | ) {} |
| 10 | 10 | |
| 11 | −const TeamMember = Schema.Struct({ | |
| 11 | +const OrgMember = Schema.Struct({ | |
| 12 | 12 | id: Schema.String, |
| 13 | 13 | userId: Schema.String, |
| 14 | 14 | email: Schema.String, |
| @@ -20,17 +20,17 @@ const TeamMember = Schema.Struct({ · 5 unmodified lines | ||
| 20 | 20 | isCurrentUser: Schema.Boolean, |
| 21 | 21 | }); |
| 22 | 22 | |
| 23 | −const TeamMembersResponse = Schema.Struct({ | |
| 24 | − members: Schema.Array(TeamMember), | |
| 23 | +const OrgMembersResponse = Schema.Struct({ | |
| 24 | + members: Schema.Array(OrgMember), | |
| 25 | 25 | }); |
| 26 | 26 | |
| 27 | −const TeamRole = Schema.Struct({ | |
| 27 | +const OrgRole = Schema.Struct({ | |
| 28 | 28 | slug: Schema.String, |
| 29 | 29 | name: Schema.String, |
| 30 | 30 | }); |
| 31 | 31 | |
| 32 | −const TeamRolesResponse = Schema.Struct({ | |
| 33 | − roles: Schema.Array(TeamRole), | |
| 32 | +const OrgRolesResponse = Schema.Struct({ | |
| 33 | + roles: Schema.Array(OrgRole), | |
| 34 | 34 | }); |
| 35 | 35 | |
| 36 | 36 | const InviteBody = Schema.Struct({ |
| @@ -57,11 +57,11 @@ const UpdateRoleResponse = Schema.Struct({ · 20 unmodified lines | ||
| 57 | 57 | success: Schema.Boolean, |
| 58 | 58 | }); |
| 59 | 59 | |
| 60 | −const UpdateTeamNameBody = Schema.Struct({ | |
| 60 | +const UpdateOrgNameBody = Schema.Struct({ | |
| 61 | 61 | name: Schema.String, |
| 62 | 62 | }); |
| 63 | 63 | |
| 64 | −const UpdateTeamNameResponse = Schema.Struct({ | |
| 64 | +const UpdateOrgNameResponse = Schema.Struct({ | |
| 65 | 65 | name: Schema.String, |
| 66 | 66 | }); |
| 67 | 67 | |
| @@ -83,60 +83,60 @@ const DomainVerificationLinkResponse = Schema.Struct({ · 15 unmodified lines | ||
| 83 | 83 | |
| 84 | 84 | const domainIdParam = HttpApiSchema.param("domainId", Schema.String); |
| 85 | 85 | |
| 86 | −export { TeamMember, TeamMembersResponse }; | |
| 86 | +export { OrgMember, OrgMembersResponse }; | |
| 87 | 87 | |
| 88 | −export class TeamApi extends HttpApiGroup.make("team") | |
| 88 | +export class OrgApi extends HttpApiGroup.make("org") | |
| 89 | 89 | .add( |
| 90 | − HttpApiEndpoint.get("listMembers")`/team/members` | |
| 91 | − .addSuccess(TeamMembersResponse) | |
| 90 | + HttpApiEndpoint.get("listMembers")`/org/members` | |
| 91 | + .addSuccess(OrgMembersResponse) | |
| 92 | 92 | .addError(WorkOSError), |
| 93 | 93 | ) |
| 94 | 94 | .add( |
| 95 | − HttpApiEndpoint.get("listRoles")`/team/roles` | |
| 96 | − .addSuccess(TeamRolesResponse) | |
| 95 | + HttpApiEndpoint.get("listRoles")`/org/roles` | |
| 96 | + .addSuccess(OrgRolesResponse) | |
| 97 | 97 | .addError(WorkOSError), |
| 98 | 98 | ) |
| 99 | 99 | .add( |
| 100 | − HttpApiEndpoint.post("invite")`/team/invite` | |
| 100 | + HttpApiEndpoint.post("invite")`/org/invite` | |
| 101 | 101 | .setPayload(InviteBody) |
| 102 | 102 | .addSuccess(InviteResponse) |
| 103 | 103 | .addError(WorkOSError) |
| 104 | 104 | .addError(Forbidden), |
| 105 | 105 | ) |
| 106 | 106 | .add( |
| 107 | − HttpApiEndpoint.del("removeMember")`/team/members/${membershipIdParam}` | |
| 107 | + HttpApiEndpoint.del("removeMember")`/org/members/${membershipIdParam}` | |
| 108 | 108 | .addSuccess(RemoveResponse) |
| 109 | 109 | .addError(WorkOSError) |
| 110 | 110 | .addError(Forbidden), |
| 111 | 111 | ) |
| 112 | 112 | .add( |
| 113 | − HttpApiEndpoint.patch("updateMemberRole")`/team/members/${membershipIdParam}/role` | |
| 113 | + HttpApiEndpoint.patch("updateMemberRole")`/org/members/${membershipIdParam}/role` | |
| 114 | 114 | .setPayload(UpdateRoleBody) |
| 115 | 115 | .addSuccess(UpdateRoleResponse) |
| 116 | 116 | .addError(WorkOSError) |
| 117 | 117 | .addError(Forbidden), |
| 118 | 118 | ) |
| 119 | 119 | .add( |
| 120 | − HttpApiEndpoint.get("listDomains")`/team/domains` | |
| 120 | + HttpApiEndpoint.get("listDomains")`/org/domains` | |
| 121 | 121 | .addSuccess(DomainsResponse) |
| 122 | 122 | .addError(WorkOSError), |
| 123 | 123 | ) |
| 124 | 124 | .add( |
| 125 | − HttpApiEndpoint.post("getDomainVerificationLink")`/team/domains/verify-link` | |
| 125 | + HttpApiEndpoint.post("getDomainVerificationLink")`/org/domains/verify-link` | |
| 126 | 126 | .addSuccess(DomainVerificationLinkResponse) |
| 127 | 127 | .addError(WorkOSError) |
| 128 | 128 | .addError(Forbidden), |
| 129 | 129 | ) |
| 130 | 130 | .add( |
| 131 | − HttpApiEndpoint.del("deleteDomain")`/team/domains/${domainIdParam}` | |
| 131 | + HttpApiEndpoint.del("deleteDomain")`/org/domains/${domainIdParam}` | |
| 132 | 132 | .addSuccess(RemoveResponse) |
| 133 | 133 | .addError(WorkOSError) |
| 134 | 134 | .addError(Forbidden), |
| 135 | 135 | ) |
| 136 | 136 | .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) | |
| 140 | 140 | .addError(WorkOSError) |
| 141 | 141 | .addError(UserStoreError) |
| 142 | 142 | .addError(Forbidden), |
| @@ -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); | |
| @@ -131,7 +131,7 @@ const withMembers: StubOverrides = { · 130 unmodified lines | ||
| 131 | 131 | // Tests |
| 132 | 132 | // --------------------------------------------------------------------------- |
| 133 | 133 | |
| 134 | −describe("Team handlers", () => { | |
| 134 | +describe("Org handlers", () => { | |
| 135 | 135 | describe("listMembers", () => { |
| 136 | 136 | it.effect("returns members with isCurrentUser set correctly", () => |
| 137 | 137 | Effect.gen(function* () { |
| @@ -6,7 +6,7 @@ import { AuthContext } from "../auth/middleware"; · 5 unmodified lines | ||
| 6 | 6 | import { WorkOSAuth } from "../auth/workos"; |
| 7 | 7 | import { server } from "../env"; |
| 8 | 8 | import { AutumnService } from "../services/autumn"; |
| 9 | −import { TeamOrgApi } from "./compose"; | |
| 9 | +import { OrgHttpApi } from "./compose"; | |
| 10 | 10 | import { Forbidden } from "./api"; |
| 11 | 11 | |
| 12 | 12 | const requireAdmin = Effect.gen(function* () { |
| @@ -19,7 +19,7 @@ const requireAdmin = Effect.gen(function* () { · 6 unmodified lines | ||
| 19 | 19 | } |
| 20 | 20 | }); |
| 21 | 21 | |
| 22 | −export const TeamHandlers = HttpApiBuilder.group(TeamOrgApi, "team", (handlers) => | |
| 22 | +export const OrgHandlers = HttpApiBuilder.group(OrgHttpApi, "org", (handlers) => | |
| 23 | 23 | handlers |
| 24 | 24 | .handle("listMembers", () => |
| 25 | 25 | Effect.gen(function* () { |
| @@ -144,7 +144,7 @@ export const TeamHandlers = HttpApiBuilder.group(TeamOrgApi, "team", (handlers) · 118 unmodified lines | ||
| 144 | 144 | const workos = yield* WorkOSAuth; |
| 145 | 145 | const { link } = yield* workos.generateDomainVerificationPortalLink( |
| 146 | 146 | 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", | |
| 148 | 148 | ); |
| 149 | 149 | return { link }; |
| 150 | 150 | }), |
| @@ -157,7 +157,7 @@ export const TeamHandlers = HttpApiBuilder.group(TeamOrgApi, "team", (handlers) · 6 unmodified lines | ||
| 157 | 157 | return { success: true }; |
| 158 | 158 | }), |
| 159 | 159 | ) |
| 160 | − .handle("updateTeamName", ({ payload }) => | |
| 160 | + .handle("updateOrgName", ({ payload }) => | |
| 161 | 161 | Effect.gen(function* () { |
| 162 | 162 | yield* requireAdmin; |
| 163 | 163 | const auth = yield* AuthContext; |
| @@ -10,8 +10,8 @@ · 9 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | import { Route as rootRouteImport } from './routes/__root' |
| 12 | 12 | import { Route as ToolsRouteImport } from './routes/tools' |
| 13 | −import { Route as TeamRouteImport } from './routes/team' | |
| 14 | 13 | import { Route as SecretsRouteImport } from './routes/secrets' |
| 14 | +import { Route as OrgRouteImport } from './routes/org' | |
| 15 | 15 | import { Route as BillingRouteImport } from './routes/billing' |
| 16 | 16 | import { Route as IndexRouteImport } from './routes/index' |
| 17 | 17 | import { Route as SourcesNamespaceRouteImport } from './routes/sources.$namespace' |
| @@ -23,16 +23,16 @@ const ToolsRoute = ToolsRouteImport.update({ · 5 unmodified lines | ||
| 23 | 23 | path: '/tools', |
| 24 | 24 | getParentRoute: () => rootRouteImport, |
| 25 | 25 | } as any) |
| 26 | −const TeamRoute = TeamRouteImport.update({ | |
| 27 | − id: '/team', | |
| 28 | − path: '/team', | |
| 29 | − getParentRoute: () => rootRouteImport, | |
| 30 | −} as any) | |
| 31 | 26 | const SecretsRoute = SecretsRouteImport.update({ |
| 32 | 27 | id: '/secrets', |
| 33 | 28 | path: '/secrets', |
| 34 | 29 | getParentRoute: () => rootRouteImport, |
| 35 | 30 | } as any) |
| 31 | +const OrgRoute = OrgRouteImport.update({ | |
| 32 | + id: '/org', | |
| 33 | + path: '/org', | |
| 34 | + getParentRoute: () => rootRouteImport, | |
| 35 | +} as any) | |
| 36 | 36 | const BillingRoute = BillingRouteImport.update({ |
| 37 | 37 | id: '/billing', |
| 38 | 38 | path: '/billing', |
| @@ -62,8 +62,8 @@ const SourcesAddPluginKeyRoute = SourcesAddPluginKeyRouteImport.update({ · 23 unmodified lines | ||
| 62 | 62 | export interface FileRoutesByFullPath { |
| 63 | 63 | '/': typeof IndexRoute |
| 64 | 64 | '/billing': typeof BillingRoute |
| 65 | + '/org': typeof OrgRoute | |
| 65 | 66 | '/secrets': typeof SecretsRoute |
| 66 | − '/team': typeof TeamRoute | |
| 67 | 67 | '/tools': typeof ToolsRoute |
| 68 | 68 | '/billing/plans': typeof BillingPlansRoute |
| 69 | 69 | '/sources/$namespace': typeof SourcesNamespaceRoute |
| @@ -72,8 +72,8 @@ export interface FileRoutesByFullPath { · 2 unmodified lines | ||
| 72 | 72 | export interface FileRoutesByTo { |
| 73 | 73 | '/': typeof IndexRoute |
| 74 | 74 | '/billing': typeof BillingRoute |
| 75 | + '/org': typeof OrgRoute | |
| 75 | 76 | '/secrets': typeof SecretsRoute |
| 76 | − '/team': typeof TeamRoute | |
| 77 | 77 | '/tools': typeof ToolsRoute |
| 78 | 78 | '/billing/plans': typeof BillingPlansRoute |
| 79 | 79 | '/sources/$namespace': typeof SourcesNamespaceRoute |
| @@ -83,8 +83,8 @@ export interface FileRoutesById { · 3 unmodified lines | ||
| 83 | 83 | __root__: typeof rootRouteImport |
| 84 | 84 | '/': typeof IndexRoute |
| 85 | 85 | '/billing': typeof BillingRoute |
| 86 | + '/org': typeof OrgRoute | |
| 86 | 87 | '/secrets': typeof SecretsRoute |
| 87 | − '/team': typeof TeamRoute | |
| 88 | 88 | '/tools': typeof ToolsRoute |
| 89 | 89 | '/billing_/plans': typeof BillingPlansRoute |
| 90 | 90 | '/sources/$namespace': typeof SourcesNamespaceRoute |
| @@ -95,8 +95,8 @@ export interface FileRouteTypes { · 4 unmodified lines | ||
| 95 | 95 | fullPaths: |
| 96 | 96 | | '/' |
| 97 | 97 | | '/billing' |
| 98 | + | '/org' | |
| 98 | 99 | | '/secrets' |
| 99 | − | '/team' | |
| 100 | 100 | | '/tools' |
| 101 | 101 | | '/billing/plans' |
| 102 | 102 | | '/sources/$namespace' |
| @@ -105,8 +105,8 @@ export interface FileRouteTypes { · 2 unmodified lines | ||
| 105 | 105 | to: |
| 106 | 106 | | '/' |
| 107 | 107 | | '/billing' |
| 108 | + | '/org' | |
| 108 | 109 | | '/secrets' |
| 109 | − | '/team' | |
| 110 | 110 | | '/tools' |
| 111 | 111 | | '/billing/plans' |
| 112 | 112 | | '/sources/$namespace' |
| @@ -115,8 +115,8 @@ export interface FileRouteTypes { · 2 unmodified lines | ||
| 115 | 115 | | '__root__' |
| 116 | 116 | | '/' |
| 117 | 117 | | '/billing' |
| 118 | + | '/org' | |
| 118 | 119 | | '/secrets' |
| 119 | − | '/team' | |
| 120 | 120 | | '/tools' |
| 121 | 121 | | '/billing_/plans' |
| 122 | 122 | | '/sources/$namespace' |
| @@ -126,8 +126,8 @@ export interface FileRouteTypes { · 3 unmodified lines | ||
| 126 | 126 | export interface RootRouteChildren { |
| 127 | 127 | IndexRoute: typeof IndexRoute |
| 128 | 128 | BillingRoute: typeof BillingRoute |
| 129 | + OrgRoute: typeof OrgRoute | |
| 129 | 130 | SecretsRoute: typeof SecretsRoute |
| 130 | − TeamRoute: typeof TeamRoute | |
| 131 | 131 | ToolsRoute: typeof ToolsRoute |
| 132 | 132 | BillingPlansRoute: typeof BillingPlansRoute |
| 133 | 133 | SourcesNamespaceRoute: typeof SourcesNamespaceRoute |
| @@ -143,13 +143,6 @@ declare module '@tanstack/react-router' { · 9 unmodified lines | ||
| 143 | 143 | preLoaderRoute: typeof ToolsRouteImport |
| 144 | 144 | parentRoute: typeof rootRouteImport |
| 145 | 145 | } |
| 146 | − '/team': { | |
| 147 | − id: '/team' | |
| 148 | − path: '/team' | |
| 149 | − fullPath: '/team' | |
| 150 | − preLoaderRoute: typeof TeamRouteImport | |
| 151 | − parentRoute: typeof rootRouteImport | |
| 152 | − } | |
| 153 | 146 | '/secrets': { |
| 154 | 147 | id: '/secrets' |
| 155 | 148 | path: '/secrets' |
| @@ -157,6 +150,13 @@ declare module '@tanstack/react-router' { · 1 unmodified line | ||
| 157 | 150 | preLoaderRoute: typeof SecretsRouteImport |
| 158 | 151 | parentRoute: typeof rootRouteImport |
| 159 | 152 | } |
| 153 | + '/org': { | |
| 154 | + id: '/org' | |
| 155 | + path: '/org' | |
| 156 | + fullPath: '/org' | |
| 157 | + preLoaderRoute: typeof OrgRouteImport | |
| 158 | + parentRoute: typeof rootRouteImport | |
| 159 | + } | |
| 160 | 160 | '/billing': { |
| 161 | 161 | id: '/billing' |
| 162 | 162 | path: '/billing' |
| @@ -198,8 +198,8 @@ declare module '@tanstack/react-router' { · 35 unmodified lines | ||
| 198 | 198 | const rootRouteChildren: RootRouteChildren = { |
| 199 | 199 | IndexRoute: IndexRoute, |
| 200 | 200 | BillingRoute: BillingRoute, |
| 201 | + OrgRoute: OrgRoute, | |
| 201 | 202 | SecretsRoute: SecretsRoute, |
| 202 | − TeamRoute: TeamRoute, | |
| 203 | 203 | ToolsRoute: ToolsRoute, |
| 204 | 204 | BillingPlansRoute: BillingPlansRoute, |
| 205 | 205 | SourcesNamespaceRoute: SourcesNamespaceRoute, |
| @@ -36,20 +36,20 @@ import { · 35 unmodified lines | ||
| 36 | 36 | DropdownMenuSeparator, |
| 37 | 37 | } from "@executor/react/components/dropdown-menu"; |
| 38 | 38 | import { |
| 39 | − teamMembersAtom, | |
| 40 | − teamRolesAtom, | |
| 41 | − teamDomainsAtom, | |
| 39 | + orgMembersAtom, | |
| 40 | + orgRolesAtom, | |
| 41 | + orgDomainsAtom, | |
| 42 | 42 | inviteMember, |
| 43 | 43 | removeMember, |
| 44 | 44 | updateMemberRole, |
| 45 | 45 | getDomainVerificationLink, |
| 46 | 46 | deleteDomain, |
| 47 | − updateTeamName, | |
| 48 | −} from "../web/team-atoms"; | |
| 47 | + updateOrgName, | |
| 48 | +} from "../web/org-atoms"; | |
| 49 | 49 | import { authAtom, useAuth } from "../web/auth"; |
| 50 | 50 | |
| 51 | −export const Route = createFileRoute("/team")({ | |
| 52 | − component: TeamPage, | |
| 51 | +export const Route = createFileRoute("/org")({ | |
| 52 | + component: OrgPage, | |
| 53 | 53 | }); |
| 54 | 54 | |
| 55 | 55 | type InviteState = { |
| @@ -102,20 +102,20 @@ function formatLastActive(lastActiveAt: string | null): string { · 46 unmodified lines | ||
| 102 | 102 | return date.toLocaleDateString(undefined, { month: "short", day: "numeric" }); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | −function TeamPage() { | |
| 105 | +function OrgPage() { | |
| 106 | 106 | const auth = useAuth(); |
| 107 | 107 | 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); | |
| 114 | 114 | const doRemove = useAtomSet(removeMember, { mode: "promiseExit" }); |
| 115 | 115 | const doUpdateRole = useAtomSet(updateMemberRole, { mode: "promiseExit" }); |
| 116 | 116 | const doDeleteDomain = useAtomSet(deleteDomain, { mode: "promiseExit" }); |
| 117 | 117 | const doGetVerificationLink = useAtomSet(getDomainVerificationLink, { mode: "promiseExit" }); |
| 118 | − const doUpdateTeamName = useAtomSet(updateTeamName, { mode: "promiseExit" }); | |
| 118 | + const doUpdateOrgName = useAtomSet(updateOrgName, { mode: "promiseExit" }); | |
| 119 | 119 | const { check, isLoading: customerLoading } = useCustomer(); |
| 120 | 120 | const canUseDomains = customerLoading ? false : check({ featureId: "domain-verification" }).allowed; |
| 121 | 121 | const [inviteOpen, setInviteOpen] = useState(false); |
| @@ -158,12 +158,12 @@ function TeamPage() { · 36 unmodified lines | ||
| 158 | 158 | return; |
| 159 | 159 | } |
| 160 | 160 | setSavingName(true); |
| 161 | − const exit = await doUpdateTeamName({ payload: { name: trimmed } }); | |
| 161 | + const exit = await doUpdateOrgName({ payload: { name: trimmed } }); | |
| 162 | 162 | if (Exit.isSuccess(exit)) { |
| 163 | − toast.success("Team name updated"); | |
| 163 | + toast.success("Organization name updated"); | |
| 164 | 164 | refreshAuth(); |
| 165 | 165 | } else { |
| 166 | − toast.error("Failed to update team name"); | |
| 166 | + toast.error("Failed to update organization name"); | |
| 167 | 167 | setEditName(orgName); |
| 168 | 168 | } |
| 169 | 169 | setSavingName(false); |
| @@ -194,7 +194,7 @@ function TeamPage() { · 24 unmodified lines | ||
| 194 | 194 | {/* Header */} |
| 195 | 195 | <div className="mb-8"> |
| 196 | 196 | <h1 className="font-display text-[2rem] tracking-tight text-foreground"> |
| 197 | − Team | |
| 197 | + Organization | |
| 198 | 198 | </h1> |
| 199 | 199 | </div> |
| 200 | 200 | |
| @@ -203,13 +203,13 @@ function TeamPage() { · 2 unmodified lines | ||
| 203 | 203 | <div className="flex items-end gap-3"> |
| 204 | 204 | <div className="min-w-0 flex-1"> |
| 205 | 205 | <Label |
| 206 | − htmlFor="team-name" | |
| 206 | + htmlFor="org-name" | |
| 207 | 207 | className="text-sm font-medium text-foreground" |
| 208 | 208 | > |
| 209 | − Team name | |
| 209 | + Organization name | |
| 210 | 210 | </Label> |
| 211 | 211 | <Input |
| 212 | − id="team-name" | |
| 212 | + id="org-name" | |
| 213 | 213 | value={editName} |
| 214 | 214 | onChange={(e) => setEditName((e.target as HTMLInputElement).value)} |
| 215 | 215 | onKeyDown={(e) => { |
| @@ -275,7 +275,7 @@ function TeamPage() { · 59 unmodified lines | ||
| 275 | 275 | if (value.domains.length === 0) { |
| 276 | 276 | return ( |
| 277 | 277 | <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. | |
| 279 | 279 | </p> |
| 280 | 280 | ); |
| 281 | 281 | } |
| @@ -321,7 +321,7 @@ function TeamPage() { · 39 unmodified lines | ||
| 321 | 321 | ), |
| 322 | 322 | onFailure: () => ( |
| 323 | 323 | <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> | |
| 325 | 325 | </div> |
| 326 | 326 | ), |
| 327 | 327 | onSuccess: ({ value }) => { |
| @@ -337,7 +337,7 @@ function TeamPage() { · 9 unmodified lines | ||
| 337 | 337 | if (filtered.length === 0) { |
| 338 | 338 | return ( |
| 339 | 339 | <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"} | |
| 341 | 341 | </p> |
| 342 | 342 | ); |
| 343 | 343 | } |
| @@ -619,7 +619,7 @@ function InviteDialog(props: { · 275 unmodified lines | ||
| 619 | 619 | <DialogHeader> |
| 620 | 620 | <DialogTitle className="font-display text-xl">Invite member</DialogTitle> |
| 621 | 621 | <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. | |
| 623 | 623 | </DialogDescription> |
| 624 | 624 | </DialogHeader> |
| 625 | 625 | |
| @@ -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); | |
| @@ -3,13 +3,13 @@ import { FetchHttpClient } from "@effect/platform"; · 2 unmodified lines | ||
| 3 | 3 | import { addGroup } from "@executor/api"; |
| 4 | 4 | import { getBaseUrl } from "@executor/react/api/base-url"; |
| 5 | 5 | import { CloudAuthApi } from "../auth/api"; |
| 6 | −import { TeamApi } from "../team/api"; | |
| 6 | +import { OrgApi } from "../org/api"; | |
| 7 | 7 | |
| 8 | 8 | // --------------------------------------------------------------------------- |
| 9 | −// Cloud API client — core API + cloud auth + team | |
| 9 | +// Cloud API client — core API + cloud auth + org | |
| 10 | 10 | // --------------------------------------------------------------------------- |
| 11 | 11 | |
| 12 | −const CloudApi = addGroup(CloudAuthApi).add(TeamApi); | |
| 12 | +const CloudApi = addGroup(CloudAuthApi).add(OrgApi); | |
| 13 | 13 | |
| 14 | 14 | class CloudApiClient extends AtomHttpApi.Tag<CloudApiClient>()("CloudApiClient", { |
| 15 | 15 | api: CloudApi, |
| @@ -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"); | |
| @@ -152,7 +152,7 @@ function SidebarContent(props: { pathname: string; onNavigate?: () => void; show · 151 unmodified lines | ||
| 152 | 152 | const isHome = props.pathname === "/"; |
| 153 | 153 | const isSecrets = props.pathname === "/secrets"; |
| 154 | 154 | const isBilling = props.pathname === "/billing" || props.pathname.startsWith("/billing/"); |
| 155 | − const isTeam = props.pathname === "/team"; | |
| 155 | + const isOrg = props.pathname === "/org"; | |
| 156 | 156 | |
| 157 | 157 | return ( |
| 158 | 158 | <> |
| @@ -167,7 +167,7 @@ function SidebarContent(props: { pathname: string; onNavigate?: () => void; show · 8 unmodified lines | ||
| 167 | 167 | <nav className="flex flex-1 flex-col overflow-y-auto p-2"> |
| 168 | 168 | <NavItem to="/" label="Sources" active={isHome} onNavigate={props.onNavigate} /> |
| 169 | 169 | <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} /> | |
| 171 | 171 | <NavItem to="/billing" label="Billing" active={isBilling} onNavigate={props.onNavigate} /> |
| 172 | 172 | |
| 173 | 173 | <div className="mt-5 mb-1 px-2.5 text-[10px] font-medium uppercase tracking-widest text-muted-foreground/50"> |
| @@ -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"); | |