merge: resolve origin/main into feat/plane-lift-merge
Merge origin/main into feat/plane-lift-merge to resolve PR #25 conflicts. Conflict resolutions: - apps/api/src/routes/states.ts: took main's complete version (reorder, GET /:id, resolveProject helper) since plane-lift's states CRUD was already incorporated via main - apps/api/src/routes/tasks.ts: merged both imports (statesTable + taskDependencies), combined filter params (stateId/stateGroup/moduleId/ cycleId from plane-lift + status removed since tasks.status column no longer exists), added stateId to zod schemas and insert/update logic Additional fixes for clean typecheck: - Removed deleted files that main re-introduced via merge (automations, statuses, timeline, gantt, nlp-parser, canvas, notifications, automation-engine, quick-add-bar, drizzle 0007-0009, migrate script) - Fixed tasks.ts: removed all tasks.status references (column replaced by stateId), removed taskStatusEnum, removed /:id/status endpoint - Fixed analytics.ts: replaced tasks.status checks with completedAt checks - Fixed index.ts: removed duplicate stateRoutes import and route registration - Cleaned up drizzle journal duplicate entries Preserved from main: - taskDependencies table definition and junction table - Komodo/CI changes (ci.yml, docker-compose.yml) - DEPLOY.md host fixes - taskDependencies route code (dependencies/dependents endpoints)
This commit is contained in:
@@ -66,4 +66,4 @@
|
||||
"breakpoints": true
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user