BuzzbeeSCD/ProjectE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(p0): resolve active domain automatically when onboarding skipped

Browse Source 
- New resolveActiveDomain() helper in apps/web/lib/auth.ts: returns the
  user's first existing domain (ordered by sort_order then created_at),
  or auto-creates a default 'Personal' domain if they have none.
- 7 affected API routes (agents, canvases, domains, habits, projects,
  search, tasks) now fall back to resolveActiveDomain when the request
  omits a domain param. This eliminates the UNDEFINED_VALUE on domain_id
  and 22P02 invalid uuid errors that broke 6+ UI flows.
- New POST /api/quick-capture route: switches on type=task|habit|note|project
  to create the right entity, after resolving the active domain. This is
  the API the dashboard quick-capture widget calls.
- packages/db/src/schema.ts: added ownerId: uuid('owner_id') to the
  domains table so each user owns their domains.
- drizzle/0004_add_owner_id_to_domains.sql: matching migration with
  column add + index.
- apps/web/__tests__/lib/auth.test.ts: unit tests for both branches of
  resolveActiveDomain (returns existing / creates Personal).
- apps/web/app/(dashboard)/canvas/page.tsx: removed hardcoded
  domain: 'personal' from the quick-create payload so server-side
  resolution can do its job.

This unblocks all of: /tasks, /habits, /projects, /search, /settings/agents,
/settings/domains, /canvas, and dashboard quick-capture.
This commit is contained in:
Hermes
2026-07-30 23:51:29 +00:00
parent 0ff005a47a
commit c3bce0b9e3
13 changed files with 308 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/app/api/agents/route.ts
+6 -3
View File
@@ -4,7 +4,7 @@
// See AGENTS.md for full rules.
import { NextRequest, NextResponse } from 'next/server';
import { withAuth, createErrorResponse } from '@/lib/auth';
import { withAuth, createErrorResponse, resolveActiveDomain } from '@/lib/auth';
import { createPocketBaseClient } from '@/lib/pocketbase';
import { createAgentSchema } from '@project-e/shared';
import { z } from 'zod';
@@ -33,10 +33,13 @@ export const GET = withAuth(async (request: NextRequest, _user) => {
});
// POST /api/agents — Create an agent with auto-generated API key
export const POST = withAuth(async (request: NextRequest, _user) => {
export const POST = withAuth(async (request: NextRequest, user) => {
try {
const body = await request.json();
const data = createAgentSchema.parse(body);
const data = createAgentSchema.parse({
...body,
domain: body.domain || (await resolveActiveDomain(user)).id,
});
const pb = createPocketBaseClient();
const agent = await pb.collection('agents').create({
apps/web/app/api/canvases/route.ts
+6 -3
View File
@@ -4,7 +4,7 @@
// See AGENTS.md for full rules.
import { NextRequest, NextResponse } from 'next/server';
import { withAuth, createErrorResponse } from '@/lib/auth';
import { withAuth, createErrorResponse, resolveActiveDomain } from '@/lib/auth';
import { createPocketBaseClient } from '@/lib/pocketbase';
import { createCanvasSchema } from '@project-e/shared';
import { z } from 'zod';
@@ -33,10 +33,13 @@ export const GET = withAuth(async (request: NextRequest, _user) => {
});
// POST /api/canvases — Create a canvas
export const POST = withAuth(async (request: NextRequest, _user) => {
export const POST = withAuth(async (request: NextRequest, user) => {
try {
const body = await request.json();
const data = createCanvasSchema.parse(body);
const data = createCanvasSchema.parse({
...body,
domain: body.domain || (await resolveActiveDomain(user)).id,
});
const pb = createPocketBaseClient();
const canvas = await pb.collection('canvases').create(data);
apps/web/app/api/domains/route.ts
+31 -6
View File
@@ -4,7 +4,7 @@
// See AGENTS.md for full rules.
import { NextRequest, NextResponse } from 'next/server';
import { withAuth, createErrorResponse } from '@/lib/auth';
import { withAuth, createErrorResponse, resolveActiveDomain } from '@/lib/auth';
import { db, domains } from '@project-e/db';
import { and, asc, desc, eq, ilike, or, sql } from 'drizzle-orm';
import { z } from 'zod';
@@ -18,7 +18,7 @@ const createDomainSchema = z.object({
});
// GET /api/domains — List domains with filtering, sorting, pagination
export const GET = withAuth(async (request: NextRequest, _user) => {
export const GET = withAuth(async (request: NextRequest, user) => {
const { searchParams } = new URL(request.url);
const page = Math.max(1, parseInt(searchParams.get('page') || '1'));
const perPage = Math.min(100, Math.max(1, parseInt(searchParams.get('perPage') || '50')));
@@ -39,8 +39,8 @@ export const GET = withAuth(async (request: NextRequest, _user) => {
? asc(sortColumns[sortField] || domains.sortOrder)
: desc(sortColumns[sortField] || domains.sortOrder);
// Build where clause
const conditions: any[] = [];
// Build where clause — filter by owner
const conditions: any[] = [eq(domains.ownerId, user.id)];
if (filter) {
conditions.push(
or(
@@ -64,7 +64,31 @@ export const GET = withAuth(async (request: NextRequest, _user) => {
.where(and(...conditions)),
]);
const totalItems = Number(countResult[0]?.count || 0);
let totalItems = Number(countResult[0]?.count || 0);
// If user has no domains, auto-create a default "Personal" domain
if (totalItems === 0) {
const active = await resolveActiveDomain(user);
// Re-fetch to include the newly created domain
const [newItems, newCount] = await Promise.all([
db.select()
.from(domains)
.where(eq(domains.ownerId, user.id))
.orderBy(orderBy)
.limit(perPage)
.offset(offset),
db.select({ count: sql<number>`count(*)` })
.from(domains)
.where(eq(domains.ownerId, user.id)),
]);
return NextResponse.json({
items: newItems,
totalItems: Number(newCount[0]?.count || 0),
totalPages: Math.ceil(Number(newCount[0]?.count || 0) / perPage),
page,
perPage,
});
}
return NextResponse.json({
items,
@@ -76,7 +100,7 @@ export const GET = withAuth(async (request: NextRequest, _user) => {
});
// POST /api/domains — Create a domain
export const POST = withAuth(async (request: NextRequest, _user) => {
export const POST = withAuth(async (request: NextRequest, user) => {
try {
const body = await request.json();
const data = createDomainSchema.parse(body);
@@ -88,6 +112,7 @@ export const POST = withAuth(async (request: NextRequest, _user) => {
color: data.color || null,
icon: data.icon || null,
parentId: data.parentId || null,
ownerId: user.id,
})
.returning();
apps/web/app/api/habits/route.ts
+11 -4
View File
@@ -4,7 +4,7 @@
// See AGENTS.md for full rules.
import { NextRequest, NextResponse } from 'next/server';
import { withAuth, createErrorResponse } from '@/lib/auth';
import { withAuth, createErrorResponse, resolveActiveDomain } from '@/lib/auth';
import { recordActivity } from '@/lib/activity';
import { db, habits, habitTags, tags as tagsTable } from '@project-e/db';
import { and, asc, desc, eq, ilike, inArray, isNull, or, sql } from 'drizzle-orm';
@@ -25,13 +25,17 @@ const createHabitSchema = z.object({
});
// GET /api/habits — List habits with filtering, sorting, pagination
export const GET = withAuth(async (request: NextRequest, _user) => {
export const GET = withAuth(async (request: NextRequest, user) => {
const { searchParams } = new URL(request.url);
const page = Math.max(1, parseInt(searchParams.get('page') || '1'));
const perPage = Math.min(100, Math.max(1, parseInt(searchParams.get('perPage') || '50')));
const filter = searchParams.get('filter') || undefined;
const sort = searchParams.get('sort') || '-created';
const domainId = searchParams.get('domain') || undefined;
let domainId = searchParams.get('domain') || undefined;
if (!domainId) {
const active = await resolveActiveDomain(user);
domainId = active.id;
}
const sortDir = sort.startsWith('-') ? 'desc' : 'asc';
const sortField = sort.replace(/^-/, '');
@@ -81,7 +85,10 @@ export const GET = withAuth(async (request: NextRequest, _user) => {
export const POST = withAuth(async (request: NextRequest, user) => {
try {
const body = await request.json();
const data = createHabitSchema.parse(body);
const data = createHabitSchema.parse({
...body,
domain: body.domain || (await resolveActiveDomain(user)).id,
});
const [habit] = await db.insert(habits).values({
name: data.name,
apps/web/app/api/projects/route.ts
+11 -4
View File
@@ -4,7 +4,7 @@
// See AGENTS.md for full rules.
import { NextRequest, NextResponse } from 'next/server';
import { withAuth, createErrorResponse } from '@/lib/auth';
import { withAuth, createErrorResponse, resolveActiveDomain } from '@/lib/auth';
import { recordActivity } from '@/lib/activity';
import { db, projects, projectTags, tags as tagsTable } from '@project-e/db';
import { and, asc, desc, eq, ilike, inArray, isNull, or, sql } from 'drizzle-orm';
@@ -24,13 +24,17 @@ const createProjectSchema = z.object({
});
// GET /api/projects — List projects with filtering, sorting, pagination
export const GET = withAuth(async (request: NextRequest, _user) => {
export const GET = withAuth(async (request: NextRequest, user) => {
const { searchParams } = new URL(request.url);
const page = Math.max(1, parseInt(searchParams.get('page') || '1'));
const perPage = Math.min(100, Math.max(1, parseInt(searchParams.get('perPage') || '50')));
const filter = searchParams.get('filter') || undefined;
const sort = searchParams.get('sort') || '-created';
const domainId = searchParams.get('domain') || undefined;
let domainId = searchParams.get('domain') || undefined;
if (!domainId) {
const active = await resolveActiveDomain(user);
domainId = active.id;
}
const sortDir = sort.startsWith('-') ? 'desc' : 'asc';
const sortField = sort.replace(/^-/, '');
@@ -79,7 +83,10 @@ export const GET = withAuth(async (request: NextRequest, _user) => {
export const POST = withAuth(async (request: NextRequest, user) => {
try {
const body = await request.json();
const data = createProjectSchema.parse(body);
const data = createProjectSchema.parse({
...body,
domain: body.domain || (await resolveActiveDomain(user)).id,
});
const [project] = await db.insert(projects).values({
name: data.name,
apps/web/app/api/quick-capture/route.ts
+110
View File
@@ -0,0 +1,110 @@
// AGENT INSTRUCTION: After every write (INSERT/UPDATE/DELETE), you MUST:
// 1. Insert activity feed entry
// 2. Call pg.notify('project_e_events', JSON.stringify({ type, action, id, workspace_id }))
// See AGENTS.md for full rules.
import { NextRequest, NextResponse } from 'next/server';
import { withAuth, createErrorResponse, resolveActiveDomain } from '@/lib/auth';
import { recordActivity } from '@/lib/activity';
import { db, tasks, habits, notes, projects } from '@project-e/db';
import { z } from 'zod';
const quickCaptureSchema = z.object({
type: z.enum(['task', 'habit', 'note', 'project']),
text: z.string().min(1, 'Text is required'),
description: z.string().optional().nullable(),
priority: z.enum(['low', 'medium', 'high', 'urgent']).optional().default('medium'),
domain: z.string().optional(),
});
// POST /api/quick-capture — Create an entity from quick text input
// Forwards to the appropriate create logic after resolving the active domain.
export const POST = withAuth(async (request: NextRequest, user) => {
try {
const body = await request.json();
const data = quickCaptureSchema.parse(body);
const domainId = data.domain || (await resolveActiveDomain(user)).id;
let result;
switch (data.type) {
case 'task': {
const [task] = await db.insert(tasks).values({
title: data.text,
description: data.description ?? null,
domainId,
priority: data.priority,
}).returning();
result = task;
await recordActivity({
actor: user.name,
action: 'created',
entityType: 'task',
entityId: task.id,
changes: { title: task.title },
workspaceId: domainId,
});
break;
}
case 'habit': {
const [habit] = await db.insert(habits).values({
name: data.text,
description: data.description ?? null,
domainId,
}).returning();
result = habit;
await recordActivity({
actor: user.name,
action: 'created',
entityType: 'habit',
entityId: habit.id,
changes: { name: habit.name },
workspaceId: domainId,
});
break;
}
case 'note': {
const [note] = await db.insert(notes).values({
title: data.text,
content: data.description ?? null,
domainId,
}).returning();
result = note;
await recordActivity({
actor: user.name,
action: 'created',
entityType: 'note',
entityId: note.id,
changes: { title: note.title },
workspaceId: domainId,
});
break;
}
case 'project': {
const [project] = await db.insert(projects).values({
name: data.text,
description: data.description ?? null,
domainId,
}).returning();
result = project;
await recordActivity({
actor: user.name,
action: 'created',
entityType: 'project',
entityId: project.id,
changes: { name: project.name },
workspaceId: domainId,
});
break;
}
}
return NextResponse.json(result, { status: 201 });
} catch (error) {
if (error instanceof z.ZodError) {
return createErrorResponse('VALIDATION_ERROR', 'Invalid input', 400, error.issues);
}
console.error('[quick-capture POST] error:', error);
return createErrorResponse('INTERNAL_ERROR', 'Failed to create', 500);
}
});
apps/web/app/api/search/route.ts
+6 -2
View File
@@ -4,7 +4,7 @@
// See AGENTS.md for full rules.
import { NextRequest, NextResponse } from 'next/server';
import { withAuth, createErrorResponse } from '@/lib/auth';
import { withAuth, createErrorResponse, resolveActiveDomain } from '@/lib/auth';
import { searchEntities } from '@/lib/search-service';
// GET /api/search?q=&type=&domain=&limit=&offset=
@@ -13,7 +13,11 @@ export const GET = withAuth(async (request: NextRequest, user) => {
const { searchParams } = new URL(request.url);
const q = (searchParams.get('q') || '').trim();
const types = searchParams.get('types')?.split(',').filter(Boolean) || ['task', 'note', 'project', 'habit', 'domain'];
const domain = searchParams.get('domain') || undefined;
let domain = searchParams.get('domain') || undefined;
if (!domain) {
const active = await resolveActiveDomain(user);
domain = active.id;
}
const limit = Math.max(1, Math.min(50, parseInt(searchParams.get('limit') || '20')));
const offset = Math.max(0, parseInt(searchParams.get('offset') || '0'));
apps/web/app/api/tasks/route.ts
+11 -4
View File
@@ -4,7 +4,7 @@
// See AGENTS.md for full rules.
import { NextRequest, NextResponse } from 'next/server';
import { withAuth, createErrorResponse } from '@/lib/auth';
import { withAuth, createErrorResponse, resolveActiveDomain } from '@/lib/auth';
import { recordActivity } from '@/lib/activity';
import { db, tasks, taskTags, tags as tagsTable } from '@project-e/db';
import { and, asc, desc, eq, ilike, inArray, isNull, or, sql } from 'drizzle-orm';
@@ -29,13 +29,17 @@ const createTaskSchema = z.object({
});
// GET /api/tasks — List tasks with filtering, sorting, pagination
export const GET = withAuth(async (request: NextRequest, _user) => {
export const GET = withAuth(async (request: NextRequest, user) => {
const { searchParams } = new URL(request.url);
const page = Math.max(1, parseInt(searchParams.get('page') || '1'));
const perPage = Math.min(100, Math.max(1, parseInt(searchParams.get('perPage') || '50')));
const filter = searchParams.get('filter') || undefined;
const sort = searchParams.get('sort') || '-created';
const domainId = searchParams.get('domain') || undefined;
let domainId = searchParams.get('domain') || undefined;
if (!domainId) {
const active = await resolveActiveDomain(user);
domainId = active.id;
}
const sortDir = sort.startsWith('-') ? 'desc' : 'asc';
const sortField = sort.replace(/^-/, '');
@@ -92,7 +96,10 @@ export const GET = withAuth(async (request: NextRequest, _user) => {
export const POST = withAuth(async (request: NextRequest, user) => {
try {
const body = await request.json();
const data = createTaskSchema.parse(body);
const data = createTaskSchema.parse({
...body,
domain: body.domain || (await resolveActiveDomain(user)).id,
});
const [task] = await db.insert(tasks).values({
title: data.title,