Skip to content

The only tool you need to know what is happening and how to fix it.

progress

dduxa687a7185511
diff --git a/CLAUDE.md b/CLAUDE.md
index 7c805f85..9e3010c6 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -664,6 +664,8 @@ backend/
| GET | `/api/organizations/:orgId/members` | Admin | List members |
| PUT | `/api/organizations/:orgId/members/:userId` | Admin | Update member role |
| DELETE | `/api/organizations/:orgId/members/:userId` | Admin | Remove member |
+| GET | `/api/organizations/:orgId/members/:userId/project-roles` | Admin | List member's per-project role overrides |
+| PUT | `/api/organizations/:orgId/members/:userId/project-roles/:projectId` | Admin | Set/clear a per-project role override |
**Invitations**
| Method | Endpoint | Auth | Purpose |
@@ -726,6 +728,7 @@ func (c *ReportController) Report(ctx *gin.Context) {
| `organizations` | Multi-tenant organizations |
| `organization_users` | Junction table linking users to organizations with roles |
| `projects` | Project config + tokens, linked to organizations |
+| `project_user_roles` | Per-project role overrides (`user`/`readonly`) for org members |
| `invitations` | Team invitations with token, role, expiry |
| `source_maps` | Uploaded source map files (project, version, storage key) |
| `metric_registry` | Custom metric definitions (type, unit, description) |
@@ -861,15 +864,22 @@ Observability (emitted every 10s via `traceway.CaptureMetric`):
Sustained drops also fire a rate-limited (1/min) `traceway.CaptureException` so overload is visible in the issues feed without flooding it.
+#### Users, Organizations & Projects
+
+- **Users to organizations is many-to-many** via `organization_users`, one role per membership. A user joins additional organizations through invitations (`POST /api/invitations/:token/accept-existing` for existing accounts) and, in cloud mode, registration. Login/register/`LoginBundle` return every membership as `Organizations[]` with roles; the frontend keeps them in `authState.organizations` and groups the navbar project selector by organization when there is more than one.
+- **Projects belong to exactly one organization** (`projects.organization_id`). Org membership grants read access to all of the org's projects.
+- **Per-project role overrides** live in `project_user_roles(project_id, user_id, role)` with role `user` or `readonly`. Overrides only apply to members whose org role is `user` or `readonly`; owners and admins always have full access to every org project. Override rows are kept when a member's org role changes (they are inert for owner/admin), and are deleted when the member is removed from the org or the project is deleted. Managed from Settings > Team Members (expand a member row) via `GET/PUT /api/organizations/:orgId/members/:userId/project-roles(/:projectId)`; `PUT` with `role: "default"` clears the override.
+- **Effective project role** (`ProjectRepository.GetEffectiveRole`): the org role if `owner`/`admin`, otherwise the override if present, otherwise the org role. `/api/projects` returns it as `role` on each project and masks `token`/`sourceMapToken` when it resolves to `readonly`; the frontend derives write gating from it (`isProjectReadonly` in `projects.svelte.ts`).
+
#### Organization Roles
| Role | Description |
|------|-------------|
| `owner` | Full access, can manage organization |
| `admin` | Full access to projects |
-| `user` | Standard access to projects |
-| `readonly` | Read-only access, cannot create projects or archive exceptions |
+| `user` | Standard access to projects (can be overridden per project to `readonly`) |
+| `readonly` | Read-only access, cannot create projects or archive exceptions (can be overridden per project to `user`) |
-The `RequireWriteAccess` middleware blocks write operations for users with `readonly` role.
+Middleware enforcement: `RequireProjectAccess` checks org membership (read access, unaffected by overrides); `RequireWriteAccess` blocks writes when the **effective project role** is `readonly`; `RequireAdminAccess` requires org role `owner`/`admin` for the `:organizationId` route param.
#### Key Columns - transactions
```sql
diff --git a/backend/app/controllers/member.controller.go b/backend/app/controllers/member.controller.go
index e0de87f9..b1c0c2e3 100644
--- a/backend/app/controllers/member.controller.go
+++ b/backend/app/controllers/member.controller.go
@@ -5,10 +5,12 @@ import (
"github.com/tracewayapp/traceway/backend/app/middleware"
"github.com/tracewayapp/traceway/backend/app/models"
"github.com/tracewayapp/traceway/backend/app/repositories"
+ "database/sql"
"net/http"
"strconv"
"github.com/gin-gonic/gin"
+ "github.com/google/uuid"
traceway "go.tracewayapp.com"
)
@@ -103,7 +105,118 @@ func (c *memberController) RemoveMember(ctx *gin.Context) {
return
}
+ err = repositories.ProjectUserRoleRepository.DeleteByOrganizationAndUser(tx, organizationId, targetUserId)
+ if err != nil {
+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to remove member project roles: %w", err))
+ return
+ }
+
ctx.JSON(http.StatusOK, gin.H{"message": "Member removed"})
}
+func (c *memberController) GetProjectRoles(ctx *gin.Context) {
+ organizationId := middleware.GetOrganizationId(ctx)
+
+ targetUserId, err := strconv.Atoi(ctx.Param("userId"))
+ if err != nil {
+ ctx.JSON(http.StatusBadRequest, gin.H{"error": "Invalid user ID"})
+ return
+ }
+
+ type projectRolesData struct {
+ OrgRole string
+ ProjectRoles []*models.MemberProjectRole
+ }
+
+ data, err := db.ExecuteTransaction(func(tx *sql.Tx) (*projectRolesData, error) {
+ orgRole, err := repositories.OrganizationRepository.GetUserRole(tx, organizationId, targetUserId)
+ if err != nil {
+ return nil, err
+ }
+ if orgRole == "" {
+ return nil, nil
+ }
+
+ projectRoles, err := repositories.ProjectUserRoleRepository.FindByOrganizationAndUser(tx, organizationId, targetUserId)
+ if err != nil {
+ return nil, err
+ }
+
+ return &projectRolesData{OrgRole: orgRole, ProjectRoles: projectRoles}, nil
+ })
+
+ if err != nil {
+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to load member project roles: %w", err))
+ return
+ }
+ if data == nil {
+ ctx.JSON(http.StatusNotFound, gin.H{"error": "User is not a member of this organization"})
+ return
+ }
+
+ ctx.JSON(http.StatusOK, gin.H{
+ "orgRole": data.OrgRole,
+ "projectRoles": data.ProjectRoles,
+ })
+}
+
+func (c *memberController) UpdateProjectRole(ctx *gin.Context) {
+ tx := db.GetTx(ctx)
+ organizationId := middleware.GetOrganizationId(ctx)
+
+ targetUserId, err := strconv.Atoi(ctx.Param("userId"))
+ if err != nil {
+ ctx.JSON(http.StatusBadRequest, gin.H{"error": "Invalid user ID"})
+ return
+ }
+
+ projectId, err := uuid.Parse(ctx.Param("projectId"))
+ if err != nil {
+ ctx.JSON(http.StatusBadRequest, gin.H{"error": "Invalid project ID"})
+ return
+ }
+
+ var request models.UpdateProjectRoleRequest
+ if err := ctx.ShouldBindJSON(&request); err != nil {
+ ctx.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})
+ return
+ }
+
+ project, err := repositories.ProjectRepository.FindById(tx, projectId)
+ if err != nil {
+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to load project: %w", err))
+ return
+ }
+ if project == nil || project.OrganizationId == nil || *project.OrganizationId != organizationId {
+ ctx.JSON(http.StatusNotFound, gin.H{"error": "Project not found in this organization"})
+ return
+ }
+
+ targetRole, err := repositories.OrganizationRepository.GetUserRole(tx, organizationId, targetUserId)
+ if err != nil {
+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to get user role: %w", err))
+ return
+ }
+ if targetRole == "" {
+ ctx.JSON(http.StatusNotFound, gin.H{"error": "User is not a member of this organization"})
+ return
+ }
+ if targetRole == "owner" || targetRole == "admin" {
+ ctx.JSON(http.StatusUnprocessableEntity, gin.H{"error": "Owners and admins always have full access to every project"})
+ return
+ }
+
+ if request.Role == "default" {
+ err = repositories.ProjectUserRoleRepository.Delete(tx, projectId, targetUserId)
+ } else {
+ err = repositories.ProjectUserRoleRepository.Upsert(tx, projectId, targetUserId, request.Role)
+ }
+ if err != nil {
+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to update project role: %w", err))
+ return
+ }
+
+ ctx.JSON(http.StatusOK, gin.H{"message": "Project role updated"})
+}
+
var MemberController = memberController{}
diff --git a/backend/app/controllers/routes.go b/backend/app/controllers/routes.go
index 2a89c524..bbaae15f 100644
--- a/backend/app/controllers/routes.go
+++ b/backend/app/controllers/routes.go
@@ -172,6 +172,8 @@ func RegisterControllers(router *gin.RouterGroup) {
router.PUT("/organizations/:organizationId/members/:userId", middleware.UseAppAuth, middleware.RequireAdminAccess, middleware.Transactional, MemberController.UpdateRole)
router.DELETE("/organizations/:organizationId/members/:userId", middleware.UseAppAuth, middleware.RequireAdminAccess, middleware.Transactional, MemberController.RemoveMember)
+ router.GET("/organizations/:organizationId/members/:userId/project-roles", middleware.UseAppAuth, middleware.RequireAdminAccess, MemberController.GetProjectRoles)
+ router.PUT("/organizations/:organizationId/members/:userId/project-roles/:projectId", middleware.UseAppAuth, middleware.RequireAdminAccess, middleware.Transactional, MemberController.UpdateProjectRole)
router.POST("/organizations/:organizationId/invitations", middleware.UseAppAuth, middleware.RequireAdminAccess, middleware.Transactional, InvitationController.InviteUser)
router.GET("/organizations/:organizationId/invitations", middleware.UseAppAuth, middleware.RequireAdminAccess, InvitationController.ListInvitations)
diff --git a/backend/app/middleware/require_write_access.middleware.go b/backend/app/middleware/require_write_access.middleware.go
index 82a4df7d..ec924099 100644
--- a/backend/app/middleware/require_write_access.middleware.go
+++ b/backend/app/middleware/require_write_access.middleware.go
@@ -43,7 +43,7 @@ func InitRequireWriteAccess() {
}
role, err := db.ExecuteTransaction(func(tx *sql.Tx) (string, error) {
- return repositories.OrganizationRepository.GetUserRole(tx, *project.OrganizationId, userId)
+ return repositories.ProjectRepository.GetEffectiveRole(tx, projectId, userId)
})
if err != nil {
@@ -51,7 +51,7 @@ func InitRequireWriteAccess() {
return
}
- if role == "readonly" {
+ if role == "readonly" || role == "" {
c.AbortWithStatusJSON(http.StatusForbidden, gin.H{"error": "Read-only access. Write operations are not permitted."})
return
}
diff --git a/backend/app/migrations/pg/0052_create_project_user_roles.up.sql b/backend/app/migrations/pg/0052_create_project_user_roles.up.sql
new file mode 100644
index 00000000..65b09431
--- /dev/null
+++ b/backend/app/migrations/pg/0052_create_project_user_roles.up.sql
@@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS project_user_roles (
+ id SERIAL PRIMARY KEY,
+ project_id UUID NOT NULL REFERENCES projects(id),
+ user_id INTEGER NOT NULL REFERENCES users(id),
+ role TEXT NOT NULL CHECK (role IN ('user','readonly')),
+ created_at TIMESTAMPTZ NOT NULL,
+ UNIQUE (project_id, user_id)
+)
diff --git a/backend/app/migrations/sqlite/0024_create_project_user_roles.up.sql b/backend/app/migrations/sqlite/0024_create_project_user_roles.up.sql
new file mode 100644
index 00000000..11c92533
--- /dev/null
+++ b/backend/app/migrations/sqlite/0024_create_project_user_roles.up.sql
@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS project_user_roles (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ project_id TEXT NOT NULL,
+ user_id INTEGER NOT NULL,
+ role TEXT NOT NULL,
+ created_at DATETIME NOT NULL,
+ UNIQUE (project_id, user_id)
+);
+
+CREATE INDEX IF NOT EXISTS idx_project_user_roles_user_id ON project_user_roles(user_id);
diff --git a/backend/app/models/models.go b/backend/app/models/models.go
index c4ed38d9..9b1bd35b 100644
--- a/backend/app/models/models.go
+++ b/backend/app/models/models.go
@@ -18,6 +18,8 @@ func Init(driver lit.Driver) {
lit.RegisterModel[Organization](driver)
lit.RegisterModel[OrganizationUser](driver)
lit.RegisterModel[OrganizationMember](driver)
+ lit.RegisterModel[ProjectUserRole](driver)
+ lit.RegisterModel[MemberProjectRole](driver)
lit.RegisterModel[Invitation](driver)
lit.RegisterModel[InvitationWithInviter](driver)
lit.RegisterModel[UserOrganizationResponse](driver)
diff --git a/backend/app/models/organization.model.go b/backend/app/models/organization.model.go
index 93874ac9..917f9fcb 100644
--- a/backend/app/models/organization.model.go
+++ b/backend/app/models/organization.model.go
@@ -40,3 +40,8 @@ type OrganizationSettingsResponse struct {
type UpdateMemberRoleRequest struct {
Role string `json:"role" binding:"required,oneof=admin user readonly"`
}
+
+// UpdateProjectRoleRequest is the request body for setting a member's per-project role override
+type UpdateProjectRoleRequest struct {
+ Role string `json:"role" binding:"required,oneof=default user readonly"`
+}
diff --git a/backend/app/models/project.model.go b/backend/app/models/project.model.go
index 6d63a29b..d4031aeb 100644
--- a/backend/app/models/project.model.go
+++ b/backend/app/models/project.model.go
@@ -70,4 +70,5 @@ func getBackendUrl() string {
type ProjectWithBackendUrl struct {
Project
BackendUrl string `json:"backendUrl"`
+ Role string `json:"role"`
}
diff --git a/backend/app/models/project_user_role.model.go b/backend/app/models/project_user_role.model.go
new file mode 100644
index 00000000..00040a56
--- /dev/null
+++ b/backend/app/models/project_user_role.model.go
@@ -0,0 +1,22 @@
+package models
+
+import (
+ "time"
+
+ "github.com/google/uuid"
+)
+
+type ProjectUserRole struct {
+ Id int `json:"id"`
+ ProjectId uuid.UUID `json:"projectId"`
+ UserId int `json:"userId"`
+ Role string `json:"role"` // user, readonly
+ CreatedAt time.Time `json:"createdAt"`
+}
+
+type MemberProjectRole struct {
+ ProjectId uuid.UUID `json:"projectId" lit:"project_id"`
+ Name string `json:"name" lit:"name"`
+ Framework string `json:"framework" lit:"framework"`
+ Role *string `json:"role" lit:"role"`
+}
diff --git a/backend/app/repositories/project.repository.go b/backend/app/repositories/project.repository.go
index cbbc65ed..30859b36 100644
--- a/backend/app/repositories/project.repository.go
+++ b/backend/app/repositories/project.repository.go
@@ -26,20 +26,38 @@ type projectWithRole struct {
HealthcheckPaths models.StringSlice `lit:"healthcheck_paths"`
ProfileLabelAllowlist models.StringSlice `lit:"profile_label_allowlist"`
Role string `lit:"role"`
+ OverrideRole *string `lit:"override_role"`
+}
+
+type effectiveRoleRow struct {
+ OrgRole string `lit:"org_role"`
+ OverrideRole *string `lit:"override_role"`
}
func init() {
models.ExtensionModelRegistrations = append(models.ExtensionModelRegistrations, func(driver lit.Driver) {
lit.RegisterModel[projectWithRole](driver)
+ lit.RegisterModel[effectiveRoleRow](driver)
})
}
+func effectiveRole(orgRole string, overrideRole *string) string {
+ if orgRole == "owner" || orgRole == "admin" {
+ return orgRole
+ }
+ if overrideRole != nil {
+ return *overrideRole
+ }
+ return orgRole
+}
+
func (p *projectRepository) FindAllWithBackendUrlByUserId(tx *sql.Tx, userId int) ([]*models.ProjectWithBackendUrl, error) {
rows, err := lit.SelectNamed[projectWithRole](
tx,
- `SELECT DISTINCT p.id, p.name, p.token, p.framework, p.organization_id, p.created_at, p.source_map_token, p.drop_healthy_healthchecks, p.healthcheck_paths, p.profile_label_allowlist, ou.role
+ `SELECT DISTINCT p.id, p.name, p.token, p.framework, p.organization_id, p.created_at, p.source_map_token, p.drop_healthy_healthchecks, p.healthcheck_paths, p.profile_label_allowlist, ou.role, pur.role as override_role
FROM projects p
INNER JOIN organization_users ou ON p.organization_id = ou.organization_id
+ LEFT JOIN project_user_roles pur ON pur.project_id = p.id AND pur.user_id = :user_id
WHERE ou.user_id = :user_id
ORDER BY p.created_at ASC`,
lit.P{"user_id": userId},
@@ -50,9 +68,10 @@ func (p *projectRepository) FindAllWithBackendUrlByUserId(tx *sql.Tx, userId int
result := make([]*models.ProjectWithBackendUrl, 0, len(rows))
for _, row := range rows {
+ role := effectiveRole(row.Role, row.OverrideRole)
token := row.Token
sourceMapToken := row.SourceMapToken
- if row.Role == "readonly" {
+ if role == "readonly" {
token = "read-only-hidden-token"
sourceMapToken = nil
}
@@ -69,12 +88,33 @@ func (p *projectRepository) FindAllWithBackendUrlByUserId(tx *sql.Tx, userId int
HealthcheckPaths: row.HealthcheckPaths,
ProfileLabelAllowlist: row.ProfileLabelAllowlist,
}
- result = append(result, project.ToProjectWithBackendUrl())
+ projectWithUrl := project.ToProjectWithBackendUrl()
+ projectWithUrl.Role = role
+ result = append(result, projectWithUrl)
}
return result, nil
}
+func (p *projectRepository) GetEffectiveRole(tx *sql.Tx, projectId uuid.UUID, userId int) (string, error) {
+ row, err := lit.SelectSingleNamed[effectiveRoleRow](
+ tx,
+ `SELECT ou.role as org_role, pur.role as override_role
+ FROM projects p
+ INNER JOIN organization_users ou ON ou.organization_id = p.organization_id AND ou.user_id = :user_id
+ LEFT JOIN project_user_roles pur ON pur.project_id = p.id AND pur.user_id = :user_id
+ WHERE p.id = :project_id`,
+ lit.P{"user_id": userId, "project_id": projectId},
+ )
+ if err != nil {
+ return "", err
+ }
+ if row == nil {
+ return "", nil
+ }
+ return effectiveRole(row.OrgRole, row.OverrideRole), nil
+}
+
func (p *projectRepository) FindAll(tx *sql.Tx) ([]*models.Project, error) {
return lit.Select[models.Project](
tx,
@@ -231,6 +271,7 @@ func (p *projectRepository) Delete(tx *sql.Tx, id uuid.UUID) error {
"widget_groups",
"source_maps",
"metric_registry",
+ "project_user_roles",
}
for _, table := range related {
if err := lit.Delete(tx, "DELETE FROM "+table+" WHERE project_id = $1", id); err != nil {
diff --git a/backend/app/repositories/project_user_role.repository.go b/backend/app/repositories/project_user_role.repository.go
new file mode 100644
index 00000000..0f87a2ab
--- /dev/null
+++ b/backend/app/repositories/project_user_role.repository.go
@@ -0,0 +1,67 @@
+package repositories
+
+import (
+ "database/sql"
+ "time"
+
+ "github.com/tracewayapp/traceway/backend/app/db"
+ "github.com/tracewayapp/traceway/backend/app/models"
+
+ "github.com/google/uuid"
+ "github.com/tracewayapp/lit/v2"
+)
+
+type projectUserRoleRepository struct{}
+
+func (r *projectUserRoleRepository) FindByOrganizationAndUser(tx *sql.Tx, organizationId int, userId int) ([]*models.MemberProjectRole, error) {
+ return lit.SelectNamed[models.MemberProjectRole](
+ tx,
+ `SELECT p.id as project_id, p.name, p.framework, pur.role
+ FROM projects p
+ LEFT JOIN project_user_roles pur ON pur.project_id = p.id AND pur.user_id = :user_id
+ WHERE p.organization_id = :org_id
+ ORDER BY p.created_at ASC`,
+ lit.P{"org_id": organizationId, "user_id": userId},
+ )
+}
+
+func (r *projectUserRoleRepository) Upsert(tx *sql.Tx, projectId uuid.UUID, userId int, role string) error {
+ query, args, err := lit.ParseNamedQuery(
+ db.Driver,
+ `INSERT INTO project_user_roles (project_id, user_id, role, created_at)
+ VALUES (:project_id, :user_id, :role, :created_at)
+ ON CONFLICT (project_id, user_id) DO UPDATE SET role = :role`,
+ lit.P{
+ "project_id": projectId,
+ "user_id": userId,
+ "role": role,
+ "created_at": time.Now().UTC(),
+ },
+ )
+ if err != nil {
+ return err
+ }
+ return lit.UpdateNative(tx, query, args...)
+}
+
+func (r *projectUserRoleRepository) Delete(tx *sql.Tx, projectId uuid.UUID, userId int) error {
+ return lit.DeleteNamed(
+ db.Driver,
+ tx,
+ "DELETE FROM project_user_roles WHERE project_id = :project_id AND user_id = :user_id",
+ lit.P{"project_id": projectId, "user_id": userId},
+ )
+}
+
+func (r *projectUserRoleRepository) DeleteByOrganizationAndUser(tx *sql.Tx, organizationId int, userId int) error {
+ return lit.DeleteNamed(
+ db.Driver,
+ tx,
+ `DELETE FROM project_user_roles
+ WHERE user_id = :user_id
+ AND project_id IN (SELECT id FROM projects WHERE organization_id = :org_id)`,
+ lit.P{"user_id": userId, "org_id": organizationId},
+ )
+}
+
+var ProjectUserRoleRepository = projectUserRoleRepository{}
diff --git a/cli/test/contract/testdata/login.schema.txt b/cli/test/contract/testdata/login.schema.txt
index 03e17066..07a9a65a 100644
--- a/cli/test/contract/testdata/login.schema.txt
+++ b/cli/test/contract/testdata/login.schema.txt
@@ -11,6 +11,7 @@ projects[].id: string
projects[].name: string
projects[].organizationId: number
projects[].profileLabelAllowlist[]: empty
+projects[].role: string
projects[].token: string
token: string
user.createdAt: string
diff --git a/cli/test/contract/testdata/projects-list.schema.txt b/cli/test/contract/testdata/projects-list.schema.txt
index 7e4ba4ef..b43641cd 100644
--- a/cli/test/contract/testdata/projects-list.schema.txt
+++ b/cli/test/contract/testdata/projects-list.schema.txt
@@ -7,4 +7,5 @@
[].name: string
[].organizationId: number
[].profileLabelAllowlist[]: empty
+[].role: string
[].token: string
diff --git a/frontend/src/lib/components/setup/source-map-upload-card.svelte b/frontend/src/lib/components/setup/source-map-upload-card.svelte
index dfbaf9a5..974b902c 100644
--- a/frontend/src/lib/components/setup/source-map-upload-card.svelte
+++ b/frontend/src/lib/components/setup/source-map-upload-card.svelte
@@ -7,8 +7,7 @@
CardTitle
} from '$lib/components/ui/card';
import { KeyRound } from 'lucide-svelte';
- import { projectsState } from '$lib/state/projects.svelte';
- import { authState } from '$lib/state/auth.svelte';
+ import { projectsState, isProjectReadonly } from '$lib/state/projects.svelte';
import SourceMapSetup from '$lib/components/source-map-setup.svelte';
let projectWithToken = $derived(projectsState.currentProject);
@@ -16,10 +15,7 @@
const isFlutter = $derived(projectWithToken?.framework === 'flutter');
const isIOS = $derived(projectWithToken?.framework === 'ios');
- const isReadonly = $derived(
- authState.getRoleForOrganization(projectsState.currentProject?.organizationId ?? 0) ===
- 'readonly'
- );
+ const isReadonly = $derived(isProjectReadonly(projectsState.currentProject));
</script>
{#if projectWithToken && !isReadonly}
diff --git a/frontend/src/lib/components/source-map-setup.svelte b/frontend/src/lib/components/source-map-setup.svelte
index 872db339..906b310f 100644
--- a/frontend/src/lib/components/source-map-setup.svelte
+++ b/frontend/src/lib/components/source-map-setup.svelte
@@ -10,8 +10,7 @@
import typescript from 'svelte-highlight/languages/typescript';
import bash from 'svelte-highlight/languages/bash';
import { themeState } from '$lib/state/theme.svelte';
- import { projectsState } from '$lib/state/projects.svelte';
- import { authState } from '$lib/state/auth.svelte';
+ import { projectsState, isProjectReadonly } from '$lib/state/projects.svelte';
type Bundler = 'vite' | 'rollup' | 'webpack';
@@ -87,9 +86,7 @@ module.exports = {
const project = $derived(projectsState.currentProject);
const sourceMapToken = $derived(project?.sourceMapToken ?? null);
- const isReadonly = $derived(
- authState.getRoleForOrganization(project?.organizationId ?? 0) === 'readonly'
- );
+ const isReadonly = $derived(isProjectReadonly(project));
const isFlutter = $derived(project?.framework === 'flutter');
const isIOS = $derived(project?.framework === 'ios');
diff --git a/frontend/src/lib/state/organization.svelte.ts b/frontend/src/lib/state/organization.svelte.ts
index 1f239f0f..8b3f395f 100644
--- a/frontend/src/lib/state/organization.svelte.ts
+++ b/frontend/src/lib/state/organization.svelte.ts
@@ -35,6 +35,18 @@ export interface OrganizationSettings {
userRole: string;
}
+export interface MemberProjectRole {
+ projectId: string;
+ name: string;
+ framework: string;
+ role: string | null;
+}
+
+export interface MemberProjectRolesResponse {
+ orgRole: string;
+ projectRoles: MemberProjectRole[];
+}
+
class OrganizationState {
currentOrganization = $state<Organization | null>(null);
members = $state<OrganizationMember[]>([]);
@@ -88,6 +100,14 @@ class OrganizationState {
await this.loadSettings(organizationId);
}
+ async getMemberProjectRoles(organizationId: number, userId: number): Promise<MemberProjectRolesResponse> {
+ return await api.get(`/organizations/${organizationId}/members/${userId}/project-roles`) as MemberProjectRolesResponse;
+ }
+
+ async updateMemberProjectRole(organizationId: number, userId: number, projectId: string, role: string) {
+ await api.put(`/organizations/${organizationId}/members/${userId}/project-roles/${projectId}`, { role });
+ }
+
async updateTimezone(organizationId: number, timezone: string) {
await api.put(`/organizations/${organizationId}/settings`, { timezone });
if (this.currentOrganization) {
diff --git a/frontend/src/lib/state/projects.svelte.ts b/frontend/src/lib/state/projects.svelte.ts
index 9d54f4cb..3f6e06f7 100644
--- a/frontend/src/lib/state/projects.svelte.ts
+++ b/frontend/src/lib/state/projects.svelte.ts
@@ -81,6 +81,14 @@ export interface Project {
dropHealthyHealthchecks: boolean;
healthcheckPaths: string[] | null;
profileLabelAllowlist: string[] | null;
+ role?: string;
+}
+
+export function isProjectReadonly(project: Project | null): boolean {
+ if (!project) return false;
+ if (project.role) return project.role === 'readonly';
+ if (!project.organizationId) return false;
+ return authState.getRoleForOrganization(project.organizationId) === 'readonly';
}
export interface ProjectWithToken extends Project {
@@ -105,11 +113,7 @@ class ProjectsState {
return authState.canManageOrganization(organizationId);
});
- canWriteCurrentProject = $derived.by(() => {
- const organizationId = this.currentProject?.organizationId;
- if (!organizationId) return true;
- return authState.getRoleForOrganization(organizationId) !== 'readonly';
- });
+ canWriteCurrentProject = $derived(!isProjectReadonly(this.currentProject));
constructor() {
$effect.root(() => {
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 45a16a7b..f9b8fe88 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -2,7 +2,7 @@
import './layout.css';
import { goto, afterNavigate } from '$app/navigation';
import { authState } from '$lib/state/auth.svelte';
- import { projectsState } from '$lib/state/projects.svelte';
+ import { projectsState, type Project } from '$lib/state/projects.svelte';
import { themeState, initTheme, toggleTheme } from '$lib/state/theme.svelte';
import { incrementNavDepth, decrementNavDepth } from '$lib/utils/back-navigation';
import AppSidebar from '$lib/components/app-sidebar.svelte';
@@ -131,10 +131,45 @@
// Optionally navigate to connection page to show token
goto('/connection');
}
+
+ const multiOrg = $derived(authState.organizations.length > 1);
+
+ const groupedProjects = $derived.by(() => {
+ const groups: { key: string; name: string; projects: Project[] }[] = [];
+ for (const org of authState.organizations) {
+ const projects = projectsState.projects.filter((p) => p.organizationId === org.id);
+ if (projects.length > 0) {
+ groups.push({ key: `org-${org.id}`, name: org.name, projects });
+ }
+ }
+ const knownOrgIds = new Set(authState.organizations.map((o) => o.id));
+ const orphans = projectsState.projects.filter(
+ (p) => !p.organizationId || !knownOrgIds.has(p.organizationId)
+ );
+ if (orphans.length > 0) {
+ groups.push({ key: 'other', name: 'Other', projects: orphans });
+ }
+ return groups;
+ });
</script>
<svelte:head><title>Traceway</title></svelte:head>
+{#snippet projectItem(project: Project, indent: boolean)}
+ <DropdownMenu.Item
+ onclick={() => handleProjectSelect(project.id)}
+ class="flex cursor-pointer items-center justify-between {indent ? 'pl-4' : ''}"
+ >
+ <div class="flex items-center gap-2">
+ <FrameworkIcon framework={project.framework} />
+ <span>{project.name}</span>
+ </div>
+ {#if project.id === projectsState.currentProjectId}
+ <Check class="h-4 w-4" />
+ {/if}
+ </DropdownMenu.Item>
+{/snippet}
+
<Tooltip.Provider delayDuration={0}>
<!-- This is not ideal, but because our layout is a top level route it can end up showing sidebar on the login page (after the login before the transition). -->
<!-- We could consider moving this to a lower level layout for the actual app, for now it's just a path check -->
@@ -157,38 +192,38 @@
<ChevronDown size={16} />
</DropdownMenu.Trigger>
<DropdownMenu.Content align="start" class="w-56">
- <DropdownMenu.Group>
- <DropdownMenu.Label>Projects</DropdownMenu.Label>
- <DropdownMenu.Separator />
- {#each projectsState.projects as project}
- <DropdownMenu.Item
- onclick={() => handleProjectSelect(project.id)}
- class="flex cursor-pointer items-center justify-between"
- >
- <div class="flex items-center gap-2">
- <FrameworkIcon framework={project.framework} />
- <span>{project.name}</span>
- </div>
- {#if project.id === projectsState.currentProjectId}
- <Check class="h-4 w-4" />
- {/if}
- </DropdownMenu.Item>
+ {#if multiOrg}
+ {#each groupedProjects as group (group.key)}
+ <DropdownMenu.Group>
+ <DropdownMenu.Label class="text-xs text-muted-foreground uppercase">{group.name}</DropdownMenu.Label>
+ {#each group.projects as project (project.id)}
+ {@render projectItem(project, true)}
+ {/each}
+ </DropdownMenu.Group>
{/each}
- {#if projectsState.projects.length === 0}
- <DropdownMenu.Item disabled>No projects yet</DropdownMenu.Item>
- {/if}
- <DropdownMenu.Separator />
- {#if projectsState.canManageCurrentProject}
- <DropdownMenu.Item onclick={() => showEditProjectModal = true} class="cursor-pointer">
- <Pencil class="mr-2 h-4 w-4" />
- Edit Project
- </DropdownMenu.Item>
- {/if}
- <DropdownMenu.Item onclick={handleAddProjectClick} class="cursor-pointer">
- <Plus class="mr-2 h-4 w-4" />
- Add Project
+ {:else}
+ <DropdownMenu.Group>
+ <DropdownMenu.Label>Projects</DropdownMenu.Label>
+ <DropdownMenu.Separator />
+ {#each projectsState.projects as project (project.id)}
+ {@render projectItem(project, false)}
+ {/each}
+ </DropdownMenu.Group>
+ {/if}
+ {#if projectsState.projects.length === 0}
+ <DropdownMenu.Item disabled>No projects yet</DropdownMenu.Item>
+ {/if}
+ <DropdownMenu.Separator />
+ {#if projectsState.canManageCurrentProject}
+ <DropdownMenu.Item onclick={() => showEditProjectModal = true} class="cursor-pointer">
+ <Pencil class="mr-2 h-4 w-4" />
+ Edit Project
</DropdownMenu.Item>
- </DropdownMenu.Group>
+ {/if}
+ <DropdownMenu.Item onclick={handleAddProjectClick} class="cursor-pointer">
+ <Plus class="mr-2 h-4 w-4" />
+ Add Project
+ </DropdownMenu.Item>
</DropdownMenu.Content>
</DropdownMenu.Root>
</h1>
diff --git a/frontend/src/routes/settings/+page.svelte b/frontend/src/routes/settings/+page.svelte
index 18f0ab0c..71d2653e 100644
--- a/frontend/src/routes/settings/+page.svelte
+++ b/frontend/src/routes/settings/+page.svelte
@@ -3,6 +3,7 @@
import { authState } from '$lib/state/auth.svelte';
import { projectsState } from '$lib/state/projects.svelte';
import { organizationState } from '$lib/state/organization.svelte';
+ import * as Select from '$lib/components/ui/select';
import OrganizationTab from './organization-tab.svelte';
import UsersTab from './users-tab.svelte';
import type { Component } from 'svelte';
@@ -26,16 +27,31 @@
loadBillingModule();
});
- const currentOrganizationId = $derived(projectsState.currentProject?.organizationId);
+ const manageableOrgs = $derived(
+ authState.organizations.filter(o => o.role === 'owner' || o.role === 'admin')
+ );
+
+ let selectedOrgId = $state<number | null>(null);
- const hasAccess = $derived(
- currentOrganizationId !== null &&
- currentOrganizationId !== undefined &&
- authState.canManageOrganization(currentOrganizationId)
+ const currentOrganizationId = $derived.by(() => {
+ if (selectedOrgId !== null && manageableOrgs.some(o => o.id === selectedOrgId)) {
+ return selectedOrgId;
+ }
+ const projectOrgId = projectsState.currentProject?.organizationId;
+ if (projectOrgId && manageableOrgs.some(o => o.id === projectOrgId)) {
+ return projectOrgId;
+ }
+ return manageableOrgs[0]?.id ?? null;
+ });
+
+ const currentOrganizationName = $derived(
+ manageableOrgs.find(o => o.id === currentOrganizationId)?.name ?? ''
);
+ const hasAccess = $derived(currentOrganizationId !== null);
+
$effect(() => {
- if (!hasAccess && !loading) {
+ if (!hasAccess) {
goto('/');
}
});
@@ -55,8 +71,27 @@
</script>
<div class="space-y-6">
- <div>
+ <div class="flex items-center justify-between gap-4">
<h1 class="text-2xl font-semibold tracking-tight">Settings</h1>
+ {#if manageableOrgs.length > 1}
+ <div class="flex items-center gap-2">
+ <span class="text-sm text-muted-foreground">Organization</span>
+ <Select.Root
+ type="single"
+ value={currentOrganizationId !== null ? String(currentOrganizationId) : undefined}
+ onValueChange={(val) => { if (val) selectedOrgId = Number(val); }}
+ >
+ <Select.Trigger class="w-[220px]">
+ {currentOrganizationName || 'Select organization'}
+ </Select.Trigger>
+ <Select.Content>
+ {#each manageableOrgs as org (org.id)}
+ <Select.Item value={String(org.id)}>{org.name}</Select.Item>
+ {/each}
+ </Select.Content>
+ </Select.Root>
+ </div>
+ {/if}
</div>
{#if loading}
diff --git a/frontend/src/routes/settings/+page.ts b/frontend/src/routes/settings/+page.ts
index d43d0cd2..d51d31ac 100644
--- a/frontend/src/routes/settings/+page.ts
+++ b/frontend/src/routes/settings/+page.ts
@@ -1 +1,15 @@
+import { redirect } from '@sveltejs/kit';
+import type { PageLoad } from './$types';
+
export const prerender = false;
+
+export const load: PageLoad = () => {
+ const organizations: { role: string }[] = JSON.parse(
+ localStorage.getItem('USER_ORGANIZATIONS') || '[]'
+ );
+ const canManage = organizations.some((o) => o.role === 'owner' || o.role === 'admin');
+ if (!canManage) {
+ throw redirect(302, '/');
+ }
+ return {};
+};
diff --git a/frontend/src/routes/settings/users-tab.svelte b/frontend/src/routes/settings/users-tab.svelte
index b39729eb..ca8d69f4 100644
--- a/frontend/src/routes/settings/users-tab.svelte
+++ b/frontend/src/routes/settings/users-tab.svelte
@@ -5,10 +5,13 @@
import * as Select from "$lib/components/ui/select";
import * as AlertDialog from "$lib/components/ui/alert-dialog";
import { Badge } from "$lib/components/ui/badge";
- import { UserPlus, Trash2 } from "@lucide/svelte";
+ import { UserPlus, Trash2, ChevronRight, ChevronDown } from "@lucide/svelte";
import { toast } from 'svelte-sonner';
- import { organizationState, type OrganizationMember, type Invitation } from '$lib/state/organization.svelte';
+ import { organizationState, type OrganizationMember, type Invitation, type MemberProjectRole } from '$lib/state/organization.svelte';
import { authState } from '$lib/state/auth.svelte';
+ import { type Framework } from '$lib/state/projects.svelte';
+ import FrameworkIcon from '$lib/components/framework-icon.svelte';
+ import { LoadingCircle } from '$lib/components/ui/loading-circle';
import InviteUserDialog from './invite-user-dialog.svelte';
interface Props {
@@ -21,6 +24,10 @@
let memberToRemove = $state<OrganizationMember | null>(null);
let invitationToRevoke = $state<Invitation | null>(null);
let processingRoleChange = $state<number | null>(null);
+ let expandedMemberId = $state<number | null>(null);
+ let memberProjectRoles = $state<Record<number, MemberProjectRole[]>>({});
+ let loadingProjectRoles = $state(false);
+ let processingProjectRole = $state<string | null>(null);
const members = $derived(organizationState.members);
const invitations = $derived(organizationState.invitations.filter(i => i.status === 'pending'));
@@ -76,6 +83,50 @@
return true;
}
+ function canExpand(member: OrganizationMember): boolean {
+ return member.role === 'user' || member.role === 'readonly';
+ }
+
+ async function toggleExpand(member: OrganizationMember) {
+ if (expandedMemberId === member.id) {
+ expandedMemberId = null;
+ return;
+ }
+ expandedMemberId = member.id;
+ if (!memberProjectRoles[member.id]) {
+ loadingProjectRoles = true;
+ try {
+ const response = await organizationState.getMemberProjectRoles(organizationId, member.id);
+ memberProjectRoles[member.id] = response.projectRoles;
+ } catch (e) {
+ toast.error(e instanceof Error ? e.message : 'Failed to load project roles', { position: 'top-center' });
+ expandedMemberId = null;
+ } finally {
+ loadingProjectRoles = false;
+ }
+ }
+ }
+
+ function projectRoleLabel(member: OrganizationMember, role: string | null): string {
+ if (!role || role === 'default') {
+ return `Default (${member.role === 'readonly' ? 'Read Only' : 'User'})`;
+ }
+ return role === 'readonly' ? 'Read Only' : 'User';
+ }
+
+ async function handleProjectRoleChange(member: OrganizationMember, projectRole: MemberProjectRole, newRole: string) {
+ processingProjectRole = projectRole.projectId;
+ try {
+ await organizationState.updateMemberProjectRole(organizationId, member.id, projectRole.projectId, newRole);
+ projectRole.role = newRole === 'default' ? null : newRole;
+ toast.success('Successfully updated the Project Role', { position: 'top-center' });
+ } catch (e) {
+ toast.error(e instanceof Error ? e.message : 'Failed to update project role', { position: 'top-center' });
+ } finally {
+ processingProjectRole = null;
+ }
+ }
+
function canRemoveMember(member: OrganizationMember): boolean {
return member.role !== 'owner';
}
@@ -114,9 +165,29 @@
</Table.Row>
</Table.Header>
<Table.Body>
- {#each members as member}
+ {#each members as member (member.id)}
<Table.Row>
- <Table.Cell class="font-medium">{member.name}</Table.Cell>
+ <Table.Cell class="font-medium">
+ <div class="flex items-center gap-1">
+ {#if canExpand(member)}
+ <button
+ type="button"
+ class="rounded p-0.5 hover:bg-accent"
+ title="Per-project access"
+ onclick={() => toggleExpand(member)}
+ >
+ {#if expandedMemberId === member.id}
+ <ChevronDown class="h-4 w-4" />
+ {:else}
+ <ChevronRight class="h-4 w-4" />
+ {/if}
+ </button>
+ {:else}
+ <span class="inline-block w-5"></span>
+ {/if}
+ {member.name}
+ </div>
+ </Table.Cell>
<Table.Cell>{member.email}</Table.Cell>
<Table.Cell>
{#if canChangeRole(member) && member.role !== 'owner'}
@@ -164,6 +235,45 @@
{/if}
</Table.Cell>
</Table.Row>
+ {#if expandedMemberId === member.id && canExpand(member)}
+ <Table.Row class="hover:bg-transparent bg-muted/30">
+ <Table.Cell colspan={5} class="py-2">
+ {#if loadingProjectRoles}
+ <div class="flex justify-center py-4">
+ <LoadingCircle />
+ </div>
+ {:else}
+ <div class="space-y-1 pl-10 pr-2">
+ {#each memberProjectRoles[member.id] ?? [] as projectRole (projectRole.projectId)}
+ <div class="flex items-center justify-between gap-4 py-1">
+ <div class="flex items-center gap-2">
+ <FrameworkIcon framework={projectRole.framework as Framework} class="size-4" />
+ <span class="text-sm">{projectRole.name}</span>
+ </div>
+ <Select.Root
+ type="single"
+ value={projectRole.role ?? 'default'}
+ onValueChange={(val) => val && handleProjectRoleChange(member, projectRole, val)}
+ disabled={processingProjectRole === projectRole.projectId}
+ >
+ <Select.Trigger class="w-[200px]">
+ {projectRoleLabel(member, projectRole.role)}
+ </Select.Trigger>
+ <Select.Content>
+ <Select.Item value="default">Default ({member.role === 'readonly' ? 'Read Only' : 'User'})</Select.Item>
+ <Select.Item value="user">User</Select.Item>
+ <Select.Item value="readonly">Read Only</Select.Item>
+ </Select.Content>
+ </Select.Root>
+ </div>
+ {:else}
+ <div class="py-2 text-sm text-muted-foreground">No projects in this organization yet</div>
+ {/each}
+ </div>
+ {/if}
+ </Table.Cell>
+ </Table.Row>
+ {/if}
{/each}
</Table.Body>
</Table.Root>