Compare commits
1 Commits
feat/ms22-
...
feat/ms21-
| Author | SHA1 | Date | |
|---|---|---|---|
| 1310eff96c |
@@ -75,16 +75,6 @@
|
|||||||
"milestone_at_end": "",
|
"milestone_at_end": "",
|
||||||
"tasks_completed": [],
|
"tasks_completed": [],
|
||||||
"last_task_id": ""
|
"last_task_id": ""
|
||||||
},
|
|
||||||
{
|
|
||||||
"session_id": "sess-002",
|
|
||||||
"runtime": "unknown",
|
|
||||||
"started_at": "2026-02-28T20:30:13Z",
|
|
||||||
"ended_at": "",
|
|
||||||
"ended_reason": "",
|
|
||||||
"milestone_at_end": "",
|
|
||||||
"tasks_completed": [],
|
|
||||||
"last_task_id": ""
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"session_id": "sess-002",
|
"session_id": "sess-001",
|
||||||
"runtime": "unknown",
|
"runtime": "unknown",
|
||||||
"pid": 3178395,
|
"pid": 2396592,
|
||||||
"started_at": "2026-02-28T20:30:13Z",
|
"started_at": "2026-02-28T17:48:51Z",
|
||||||
"project_path": "/tmp/ms21-ui-001",
|
"project_path": "/tmp/ms21-api-003",
|
||||||
"milestone_id": ""
|
"milestone_id": ""
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,9 +34,3 @@ CVE-2026-26996 # HIGH: minimatch DoS via specially crafted glob patterns (needs
|
|||||||
# OpenBao 2.5.0 compiled with Go 1.25.6, fix needs Go >= 1.25.7.
|
# OpenBao 2.5.0 compiled with Go 1.25.6, fix needs Go >= 1.25.7.
|
||||||
# Cannot build OpenBao from source (large project). Waiting for upstream release.
|
# Cannot build OpenBao from source (large project). Waiting for upstream release.
|
||||||
CVE-2025-68121 # CRITICAL: crypto/tls session resumption
|
CVE-2025-68121 # CRITICAL: crypto/tls session resumption
|
||||||
|
|
||||||
# === multer CVEs (upstream via @nestjs/platform-express) ===
|
|
||||||
# multer <2.1.0 — waiting on NestJS to update their dependency
|
|
||||||
# These are DoS vulnerabilities in file upload handling
|
|
||||||
GHSA-xf7r-hgr6-v32p # HIGH: DoS via incomplete cleanup
|
|
||||||
GHSA-v52c-386h-88mc # HIGH: DoS via resource exhaustion
|
|
||||||
|
|||||||
232
.woodpecker/api.yml
Normal file
232
.woodpecker/api.yml
Normal file
@@ -0,0 +1,232 @@
|
|||||||
|
# API Pipeline - Mosaic Stack
|
||||||
|
# Quality gates, build, and Docker publish for @mosaic/api
|
||||||
|
#
|
||||||
|
# Triggers on: apps/api/**, packages/**, root configs
|
||||||
|
# Security chain: source audit + Trivy container scan
|
||||||
|
|
||||||
|
when:
|
||||||
|
- event: [push, pull_request, manual]
|
||||||
|
path:
|
||||||
|
include:
|
||||||
|
- "apps/api/**"
|
||||||
|
- "packages/**"
|
||||||
|
- "pnpm-lock.yaml"
|
||||||
|
- "pnpm-workspace.yaml"
|
||||||
|
- "turbo.json"
|
||||||
|
- "package.json"
|
||||||
|
- ".woodpecker/api.yml"
|
||||||
|
- ".trivyignore"
|
||||||
|
|
||||||
|
variables:
|
||||||
|
- &node_image "node:24-alpine"
|
||||||
|
- &install_deps |
|
||||||
|
corepack enable
|
||||||
|
pnpm install --frozen-lockfile
|
||||||
|
- &use_deps |
|
||||||
|
corepack enable
|
||||||
|
- &turbo_env
|
||||||
|
TURBO_API:
|
||||||
|
from_secret: turbo_api
|
||||||
|
TURBO_TOKEN:
|
||||||
|
from_secret: turbo_token
|
||||||
|
TURBO_TEAM:
|
||||||
|
from_secret: turbo_team
|
||||||
|
- &kaniko_setup |
|
||||||
|
mkdir -p /kaniko/.docker
|
||||||
|
echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$GITEA_USER\",\"password\":\"$GITEA_TOKEN\"}}}" > /kaniko/.docker/config.json
|
||||||
|
|
||||||
|
services:
|
||||||
|
postgres:
|
||||||
|
image: postgres:17.7-alpine3.22
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: test_db
|
||||||
|
POSTGRES_USER: test_user
|
||||||
|
POSTGRES_PASSWORD: test_password
|
||||||
|
|
||||||
|
steps:
|
||||||
|
# === Quality Gates ===
|
||||||
|
|
||||||
|
install:
|
||||||
|
image: *node_image
|
||||||
|
commands:
|
||||||
|
- *install_deps
|
||||||
|
|
||||||
|
security-audit:
|
||||||
|
image: *node_image
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm audit --audit-level=high
|
||||||
|
depends_on:
|
||||||
|
- install
|
||||||
|
|
||||||
|
prisma-generate:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm --filter "@mosaic/api" prisma:generate
|
||||||
|
depends_on:
|
||||||
|
- install
|
||||||
|
|
||||||
|
lint:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
<<: *turbo_env
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm turbo lint --filter=@mosaic/api
|
||||||
|
depends_on:
|
||||||
|
- prisma-generate
|
||||||
|
|
||||||
|
typecheck:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
<<: *turbo_env
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm turbo typecheck --filter=@mosaic/api
|
||||||
|
depends_on:
|
||||||
|
- prisma-generate
|
||||||
|
|
||||||
|
prisma-migrate:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
DATABASE_URL: "postgresql://test_user:test_password@postgres:5432/test_db?schema=public"
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm --filter "@mosaic/api" prisma migrate deploy
|
||||||
|
depends_on:
|
||||||
|
- prisma-generate
|
||||||
|
|
||||||
|
test:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
DATABASE_URL: "postgresql://test_user:test_password@postgres:5432/test_db?schema=public"
|
||||||
|
ENCRYPTION_KEY: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm --filter "@mosaic/api" exec vitest run --exclude 'src/auth/auth-rls.integration.spec.ts' --exclude 'src/credentials/user-credential.model.spec.ts' --exclude 'src/job-events/job-events.performance.spec.ts' --exclude 'src/knowledge/services/fulltext-search.spec.ts' --exclude 'src/mosaic-telemetry/mosaic-telemetry.module.spec.ts'
|
||||||
|
depends_on:
|
||||||
|
- prisma-migrate
|
||||||
|
|
||||||
|
# === Build ===
|
||||||
|
|
||||||
|
build:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
NODE_ENV: "production"
|
||||||
|
<<: *turbo_env
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm turbo build --filter=@mosaic/api
|
||||||
|
depends_on:
|
||||||
|
- lint
|
||||||
|
- typecheck
|
||||||
|
- test
|
||||||
|
- security-audit
|
||||||
|
|
||||||
|
# === Docker Build & Push ===
|
||||||
|
|
||||||
|
docker-build-api:
|
||||||
|
image: gcr.io/kaniko-project/executor:debug
|
||||||
|
environment:
|
||||||
|
GITEA_USER:
|
||||||
|
from_secret: gitea_username
|
||||||
|
GITEA_TOKEN:
|
||||||
|
from_secret: gitea_token
|
||||||
|
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
||||||
|
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
||||||
|
commands:
|
||||||
|
- *kaniko_setup
|
||||||
|
- |
|
||||||
|
DESTINATIONS=""
|
||||||
|
if [ -n "$CI_COMMIT_TAG" ]; then
|
||||||
|
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-api:$CI_COMMIT_TAG"
|
||||||
|
elif [ "$CI_COMMIT_BRANCH" = "main" ]; then
|
||||||
|
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-api:latest"
|
||||||
|
fi
|
||||||
|
/kaniko/executor --context . --dockerfile apps/api/Dockerfile --snapshot-mode=redo $DESTINATIONS
|
||||||
|
when:
|
||||||
|
- branch: [main]
|
||||||
|
event: [push, manual, tag]
|
||||||
|
depends_on:
|
||||||
|
- build
|
||||||
|
|
||||||
|
# === Container Security Scan ===
|
||||||
|
|
||||||
|
security-trivy-api:
|
||||||
|
image: aquasec/trivy:latest
|
||||||
|
environment:
|
||||||
|
GITEA_USER:
|
||||||
|
from_secret: gitea_username
|
||||||
|
GITEA_TOKEN:
|
||||||
|
from_secret: gitea_token
|
||||||
|
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
||||||
|
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
||||||
|
commands:
|
||||||
|
- |
|
||||||
|
if [ -n "$$CI_COMMIT_TAG" ]; then
|
||||||
|
SCAN_TAG="$$CI_COMMIT_TAG"
|
||||||
|
elif [ "$$CI_COMMIT_BRANCH" = "main" ]; then
|
||||||
|
SCAN_TAG="latest"
|
||||||
|
else
|
||||||
|
SCAN_TAG="latest"
|
||||||
|
fi
|
||||||
|
mkdir -p ~/.docker
|
||||||
|
echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$$GITEA_USER\",\"password\":\"$$GITEA_TOKEN\"}}}" > ~/.docker/config.json
|
||||||
|
trivy image --exit-code 1 --severity HIGH,CRITICAL --ignore-unfixed \
|
||||||
|
--ignorefile .trivyignore \
|
||||||
|
git.mosaicstack.dev/mosaic/stack-api:$$SCAN_TAG
|
||||||
|
when:
|
||||||
|
- branch: [main]
|
||||||
|
event: [push, manual, tag]
|
||||||
|
depends_on:
|
||||||
|
- docker-build-api
|
||||||
|
|
||||||
|
# === Package Linking ===
|
||||||
|
|
||||||
|
link-packages:
|
||||||
|
image: alpine:3
|
||||||
|
environment:
|
||||||
|
GITEA_TOKEN:
|
||||||
|
from_secret: gitea_token
|
||||||
|
commands:
|
||||||
|
- apk add --no-cache curl
|
||||||
|
- sleep 10
|
||||||
|
- |
|
||||||
|
set -e
|
||||||
|
link_package() {
|
||||||
|
PKG="$$1"
|
||||||
|
echo "Linking $$PKG..."
|
||||||
|
for attempt in 1 2 3; do
|
||||||
|
STATUS=$$(curl -s -o /tmp/link-response.txt -w "%{http_code}" -X POST \
|
||||||
|
-H "Authorization: token $$GITEA_TOKEN" \
|
||||||
|
"https://git.mosaicstack.dev/api/v1/packages/mosaic/container/$$PKG/-/link/stack")
|
||||||
|
if [ "$$STATUS" = "201" ] || [ "$$STATUS" = "204" ]; then
|
||||||
|
echo " Linked $$PKG"
|
||||||
|
return 0
|
||||||
|
elif [ "$$STATUS" = "400" ]; then
|
||||||
|
echo " $$PKG already linked"
|
||||||
|
return 0
|
||||||
|
elif [ "$$STATUS" = "404" ] && [ $$attempt -lt 3 ]; then
|
||||||
|
echo " $$PKG not found yet, retrying in 5s (attempt $$attempt/3)..."
|
||||||
|
sleep 5
|
||||||
|
else
|
||||||
|
echo " FAILED: $$PKG status $$STATUS"
|
||||||
|
cat /tmp/link-response.txt
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
link_package "stack-api"
|
||||||
|
when:
|
||||||
|
- branch: [main]
|
||||||
|
event: [push, manual, tag]
|
||||||
|
depends_on:
|
||||||
|
- security-trivy-api
|
||||||
@@ -1,337 +0,0 @@
|
|||||||
# Unified CI Pipeline - Mosaic Stack
|
|
||||||
# Single install, parallel quality gates, sequential deploy
|
|
||||||
#
|
|
||||||
# Replaces: api.yml, orchestrator.yml, web.yml
|
|
||||||
# Keeps: coordinator.yml (Python), infra.yml (separate concerns)
|
|
||||||
#
|
|
||||||
# Flow:
|
|
||||||
# install → security-audit
|
|
||||||
# → prisma-generate → lint + typecheck (parallel)
|
|
||||||
# → prisma-migrate → test
|
|
||||||
# → build (after all gates pass)
|
|
||||||
# → docker builds (main only, parallel)
|
|
||||||
# → trivy scans (main only, parallel)
|
|
||||||
# → package linking (main only)
|
|
||||||
|
|
||||||
when:
|
|
||||||
- event: [push, pull_request, manual]
|
|
||||||
path:
|
|
||||||
include:
|
|
||||||
- "apps/api/**"
|
|
||||||
- "apps/orchestrator/**"
|
|
||||||
- "apps/web/**"
|
|
||||||
- "packages/**"
|
|
||||||
- "pnpm-lock.yaml"
|
|
||||||
- "pnpm-workspace.yaml"
|
|
||||||
- "turbo.json"
|
|
||||||
- "package.json"
|
|
||||||
- ".woodpecker/ci.yml"
|
|
||||||
- ".trivyignore"
|
|
||||||
|
|
||||||
variables:
|
|
||||||
- &node_image "node:24-alpine"
|
|
||||||
- &install_deps |
|
|
||||||
corepack enable
|
|
||||||
pnpm install --frozen-lockfile
|
|
||||||
- &use_deps |
|
|
||||||
corepack enable
|
|
||||||
- &turbo_env
|
|
||||||
TURBO_API:
|
|
||||||
from_secret: turbo_api
|
|
||||||
TURBO_TOKEN:
|
|
||||||
from_secret: turbo_token
|
|
||||||
TURBO_TEAM:
|
|
||||||
from_secret: turbo_team
|
|
||||||
- &kaniko_setup |
|
|
||||||
mkdir -p /kaniko/.docker
|
|
||||||
echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$GITEA_USER\",\"password\":\"$GITEA_TOKEN\"}}}" > /kaniko/.docker/config.json
|
|
||||||
|
|
||||||
services:
|
|
||||||
postgres:
|
|
||||||
image: postgres:17.7-alpine3.22
|
|
||||||
environment:
|
|
||||||
POSTGRES_DB: test_db
|
|
||||||
POSTGRES_USER: test_user
|
|
||||||
POSTGRES_PASSWORD: test_password
|
|
||||||
|
|
||||||
steps:
|
|
||||||
# ─── Install (once) ─────────────────────────────────────────
|
|
||||||
install:
|
|
||||||
image: *node_image
|
|
||||||
commands:
|
|
||||||
- *install_deps
|
|
||||||
|
|
||||||
# ─── Security Audit (once) ──────────────────────────────────
|
|
||||||
security-audit:
|
|
||||||
image: *node_image
|
|
||||||
commands:
|
|
||||||
- *use_deps
|
|
||||||
- pnpm audit --audit-level=high
|
|
||||||
depends_on:
|
|
||||||
- install
|
|
||||||
|
|
||||||
# ─── Prisma Generate ────────────────────────────────────────
|
|
||||||
prisma-generate:
|
|
||||||
image: *node_image
|
|
||||||
environment:
|
|
||||||
SKIP_ENV_VALIDATION: "true"
|
|
||||||
commands:
|
|
||||||
- *use_deps
|
|
||||||
- pnpm --filter "@mosaic/api" prisma:generate
|
|
||||||
depends_on:
|
|
||||||
- install
|
|
||||||
|
|
||||||
# ─── Lint (all packages) ────────────────────────────────────
|
|
||||||
lint:
|
|
||||||
image: *node_image
|
|
||||||
environment:
|
|
||||||
SKIP_ENV_VALIDATION: "true"
|
|
||||||
<<: *turbo_env
|
|
||||||
commands:
|
|
||||||
- *use_deps
|
|
||||||
- pnpm turbo lint
|
|
||||||
depends_on:
|
|
||||||
- prisma-generate
|
|
||||||
|
|
||||||
# ─── Typecheck (all packages, parallel with lint) ───────────
|
|
||||||
typecheck:
|
|
||||||
image: *node_image
|
|
||||||
environment:
|
|
||||||
SKIP_ENV_VALIDATION: "true"
|
|
||||||
<<: *turbo_env
|
|
||||||
commands:
|
|
||||||
- *use_deps
|
|
||||||
- pnpm turbo typecheck
|
|
||||||
depends_on:
|
|
||||||
- prisma-generate
|
|
||||||
|
|
||||||
# ─── Prisma Migrate (test DB) ──────────────────────────────
|
|
||||||
prisma-migrate:
|
|
||||||
image: *node_image
|
|
||||||
environment:
|
|
||||||
SKIP_ENV_VALIDATION: "true"
|
|
||||||
DATABASE_URL: "postgresql://test_user:test_password@postgres:5432/test_db?schema=public"
|
|
||||||
commands:
|
|
||||||
- *use_deps
|
|
||||||
- pnpm --filter "@mosaic/api" prisma migrate deploy
|
|
||||||
depends_on:
|
|
||||||
- prisma-generate
|
|
||||||
|
|
||||||
# ─── Test (all packages) ───────────────────────────────────
|
|
||||||
test:
|
|
||||||
image: *node_image
|
|
||||||
environment:
|
|
||||||
SKIP_ENV_VALIDATION: "true"
|
|
||||||
DATABASE_URL: "postgresql://test_user:test_password@postgres:5432/test_db?schema=public"
|
|
||||||
ENCRYPTION_KEY: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
<<: *turbo_env
|
|
||||||
commands:
|
|
||||||
- *use_deps
|
|
||||||
- pnpm --filter "@mosaic/api" exec vitest run --exclude 'src/auth/auth-rls.integration.spec.ts' --exclude 'src/credentials/user-credential.model.spec.ts' --exclude 'src/job-events/job-events.performance.spec.ts' --exclude 'src/knowledge/services/fulltext-search.spec.ts' --exclude 'src/mosaic-telemetry/mosaic-telemetry.module.spec.ts'
|
|
||||||
- pnpm turbo test --filter=@mosaic/orchestrator --filter=@mosaic/web
|
|
||||||
depends_on:
|
|
||||||
- prisma-migrate
|
|
||||||
|
|
||||||
# ─── Build (all packages) ──────────────────────────────────
|
|
||||||
build:
|
|
||||||
image: *node_image
|
|
||||||
environment:
|
|
||||||
SKIP_ENV_VALIDATION: "true"
|
|
||||||
NODE_ENV: "production"
|
|
||||||
<<: *turbo_env
|
|
||||||
commands:
|
|
||||||
- *use_deps
|
|
||||||
- pnpm turbo build
|
|
||||||
depends_on:
|
|
||||||
- lint
|
|
||||||
- typecheck
|
|
||||||
- test
|
|
||||||
- security-audit
|
|
||||||
|
|
||||||
# ─── Docker Builds (main only, parallel) ───────────────────
|
|
||||||
|
|
||||||
docker-build-api:
|
|
||||||
image: gcr.io/kaniko-project/executor:debug
|
|
||||||
environment:
|
|
||||||
GITEA_USER:
|
|
||||||
from_secret: gitea_username
|
|
||||||
GITEA_TOKEN:
|
|
||||||
from_secret: gitea_token
|
|
||||||
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
|
||||||
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
|
||||||
commands:
|
|
||||||
- *kaniko_setup
|
|
||||||
- |
|
|
||||||
DESTINATIONS=""
|
|
||||||
if [ -n "$CI_COMMIT_TAG" ]; then
|
|
||||||
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-api:$CI_COMMIT_TAG"
|
|
||||||
elif [ "$CI_COMMIT_BRANCH" = "main" ]; then
|
|
||||||
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-api:latest"
|
|
||||||
fi
|
|
||||||
/kaniko/executor --context . --dockerfile apps/api/Dockerfile --snapshot-mode=redo $DESTINATIONS
|
|
||||||
when:
|
|
||||||
- branch: [main]
|
|
||||||
event: [push, manual, tag]
|
|
||||||
depends_on:
|
|
||||||
- build
|
|
||||||
|
|
||||||
docker-build-orchestrator:
|
|
||||||
image: gcr.io/kaniko-project/executor:debug
|
|
||||||
environment:
|
|
||||||
GITEA_USER:
|
|
||||||
from_secret: gitea_username
|
|
||||||
GITEA_TOKEN:
|
|
||||||
from_secret: gitea_token
|
|
||||||
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
|
||||||
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
|
||||||
commands:
|
|
||||||
- *kaniko_setup
|
|
||||||
- |
|
|
||||||
DESTINATIONS=""
|
|
||||||
if [ -n "$CI_COMMIT_TAG" ]; then
|
|
||||||
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-orchestrator:$CI_COMMIT_TAG"
|
|
||||||
elif [ "$CI_COMMIT_BRANCH" = "main" ]; then
|
|
||||||
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-orchestrator:latest"
|
|
||||||
fi
|
|
||||||
/kaniko/executor --context . --dockerfile apps/orchestrator/Dockerfile --snapshot-mode=redo $DESTINATIONS
|
|
||||||
when:
|
|
||||||
- branch: [main]
|
|
||||||
event: [push, manual, tag]
|
|
||||||
depends_on:
|
|
||||||
- build
|
|
||||||
|
|
||||||
docker-build-web:
|
|
||||||
image: gcr.io/kaniko-project/executor:debug
|
|
||||||
environment:
|
|
||||||
GITEA_USER:
|
|
||||||
from_secret: gitea_username
|
|
||||||
GITEA_TOKEN:
|
|
||||||
from_secret: gitea_token
|
|
||||||
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
|
||||||
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
|
||||||
commands:
|
|
||||||
- *kaniko_setup
|
|
||||||
- |
|
|
||||||
DESTINATIONS=""
|
|
||||||
if [ -n "$CI_COMMIT_TAG" ]; then
|
|
||||||
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-web:$CI_COMMIT_TAG"
|
|
||||||
elif [ "$CI_COMMIT_BRANCH" = "main" ]; then
|
|
||||||
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-web:latest"
|
|
||||||
fi
|
|
||||||
/kaniko/executor --context . --dockerfile apps/web/Dockerfile --snapshot-mode=redo --build-arg NEXT_PUBLIC_API_URL=https://api.mosaicstack.dev $DESTINATIONS
|
|
||||||
when:
|
|
||||||
- branch: [main]
|
|
||||||
event: [push, manual, tag]
|
|
||||||
depends_on:
|
|
||||||
- build
|
|
||||||
|
|
||||||
# ─── Container Security Scans (main only) ──────────────────
|
|
||||||
|
|
||||||
security-trivy-api:
|
|
||||||
image: aquasec/trivy:latest
|
|
||||||
environment:
|
|
||||||
GITEA_USER:
|
|
||||||
from_secret: gitea_username
|
|
||||||
GITEA_TOKEN:
|
|
||||||
from_secret: gitea_token
|
|
||||||
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
|
||||||
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
|
||||||
commands:
|
|
||||||
- |
|
|
||||||
if [ -n "$$CI_COMMIT_TAG" ]; then SCAN_TAG="$$CI_COMMIT_TAG"; else SCAN_TAG="latest"; fi
|
|
||||||
mkdir -p ~/.docker
|
|
||||||
echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$$GITEA_USER\",\"password\":\"$$GITEA_TOKEN\"}}}" > ~/.docker/config.json
|
|
||||||
trivy image --exit-code 1 --severity HIGH,CRITICAL --ignore-unfixed --ignorefile .trivyignore git.mosaicstack.dev/mosaic/stack-api:$$SCAN_TAG
|
|
||||||
when:
|
|
||||||
- branch: [main]
|
|
||||||
event: [push, manual, tag]
|
|
||||||
depends_on:
|
|
||||||
- docker-build-api
|
|
||||||
|
|
||||||
security-trivy-orchestrator:
|
|
||||||
image: aquasec/trivy:latest
|
|
||||||
environment:
|
|
||||||
GITEA_USER:
|
|
||||||
from_secret: gitea_username
|
|
||||||
GITEA_TOKEN:
|
|
||||||
from_secret: gitea_token
|
|
||||||
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
|
||||||
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
|
||||||
commands:
|
|
||||||
- |
|
|
||||||
if [ -n "$$CI_COMMIT_TAG" ]; then SCAN_TAG="$$CI_COMMIT_TAG"; else SCAN_TAG="latest"; fi
|
|
||||||
mkdir -p ~/.docker
|
|
||||||
echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$$GITEA_USER\",\"password\":\"$$GITEA_TOKEN\"}}}" > ~/.docker/config.json
|
|
||||||
trivy image --exit-code 1 --severity HIGH,CRITICAL --ignore-unfixed --ignorefile .trivyignore git.mosaicstack.dev/mosaic/stack-orchestrator:$$SCAN_TAG
|
|
||||||
when:
|
|
||||||
- branch: [main]
|
|
||||||
event: [push, manual, tag]
|
|
||||||
depends_on:
|
|
||||||
- docker-build-orchestrator
|
|
||||||
|
|
||||||
security-trivy-web:
|
|
||||||
image: aquasec/trivy:latest
|
|
||||||
environment:
|
|
||||||
GITEA_USER:
|
|
||||||
from_secret: gitea_username
|
|
||||||
GITEA_TOKEN:
|
|
||||||
from_secret: gitea_token
|
|
||||||
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
|
||||||
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
|
||||||
commands:
|
|
||||||
- |
|
|
||||||
if [ -n "$$CI_COMMIT_TAG" ]; then SCAN_TAG="$$CI_COMMIT_TAG"; else SCAN_TAG="latest"; fi
|
|
||||||
mkdir -p ~/.docker
|
|
||||||
echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$$GITEA_USER\",\"password\":\"$$GITEA_TOKEN\"}}}" > ~/.docker/config.json
|
|
||||||
trivy image --exit-code 1 --severity HIGH,CRITICAL --ignore-unfixed --ignorefile .trivyignore git.mosaicstack.dev/mosaic/stack-web:$$SCAN_TAG
|
|
||||||
when:
|
|
||||||
- branch: [main]
|
|
||||||
event: [push, manual, tag]
|
|
||||||
depends_on:
|
|
||||||
- docker-build-web
|
|
||||||
|
|
||||||
# ─── Package Linking (main only, once) ─────────────────────
|
|
||||||
|
|
||||||
link-packages:
|
|
||||||
image: alpine:3
|
|
||||||
environment:
|
|
||||||
GITEA_TOKEN:
|
|
||||||
from_secret: gitea_token
|
|
||||||
commands:
|
|
||||||
- apk add --no-cache curl
|
|
||||||
- sleep 10
|
|
||||||
- |
|
|
||||||
set -e
|
|
||||||
link_package() {
|
|
||||||
PKG="$$1"
|
|
||||||
echo "Linking $$PKG..."
|
|
||||||
for attempt in 1 2 3; do
|
|
||||||
STATUS=$$(curl -s -o /tmp/link-response.txt -w "%{http_code}" -X POST \
|
|
||||||
-H "Authorization: token $$GITEA_TOKEN" \
|
|
||||||
"https://git.mosaicstack.dev/api/v1/packages/mosaic/container/$$PKG/-/link/stack")
|
|
||||||
if [ "$$STATUS" = "201" ] || [ "$$STATUS" = "204" ]; then
|
|
||||||
echo " Linked $$PKG"
|
|
||||||
return 0
|
|
||||||
elif [ "$$STATUS" = "400" ]; then
|
|
||||||
echo " $$PKG already linked"
|
|
||||||
return 0
|
|
||||||
elif [ "$$STATUS" = "404" ] && [ $$attempt -lt 3 ]; then
|
|
||||||
echo " $$PKG not found yet, retrying in 5s (attempt $$attempt/3)..."
|
|
||||||
sleep 5
|
|
||||||
else
|
|
||||||
echo " FAILED: $$PKG status $$STATUS"
|
|
||||||
cat /tmp/link-response.txt
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
link_package "stack-api"
|
|
||||||
link_package "stack-orchestrator"
|
|
||||||
link_package "stack-web"
|
|
||||||
when:
|
|
||||||
- branch: [main]
|
|
||||||
event: [push, manual, tag]
|
|
||||||
depends_on:
|
|
||||||
- security-trivy-api
|
|
||||||
- security-trivy-orchestrator
|
|
||||||
- security-trivy-web
|
|
||||||
202
.woodpecker/orchestrator.yml
Normal file
202
.woodpecker/orchestrator.yml
Normal file
@@ -0,0 +1,202 @@
|
|||||||
|
# Orchestrator Pipeline - Mosaic Stack
|
||||||
|
# Quality gates, build, and Docker publish for @mosaic/orchestrator
|
||||||
|
#
|
||||||
|
# Triggers on: apps/orchestrator/**, packages/**, root configs
|
||||||
|
# Security chain: source audit + Trivy container scan
|
||||||
|
|
||||||
|
when:
|
||||||
|
- event: [push, pull_request, manual]
|
||||||
|
path:
|
||||||
|
include:
|
||||||
|
- "apps/orchestrator/**"
|
||||||
|
- "packages/**"
|
||||||
|
- "pnpm-lock.yaml"
|
||||||
|
- "pnpm-workspace.yaml"
|
||||||
|
- "turbo.json"
|
||||||
|
- "package.json"
|
||||||
|
- ".woodpecker/orchestrator.yml"
|
||||||
|
- ".trivyignore"
|
||||||
|
|
||||||
|
variables:
|
||||||
|
- &node_image "node:24-alpine"
|
||||||
|
- &install_deps |
|
||||||
|
corepack enable
|
||||||
|
pnpm install --frozen-lockfile
|
||||||
|
- &use_deps |
|
||||||
|
corepack enable
|
||||||
|
- &turbo_env
|
||||||
|
TURBO_API:
|
||||||
|
from_secret: turbo_api
|
||||||
|
TURBO_TOKEN:
|
||||||
|
from_secret: turbo_token
|
||||||
|
TURBO_TEAM:
|
||||||
|
from_secret: turbo_team
|
||||||
|
- &kaniko_setup |
|
||||||
|
mkdir -p /kaniko/.docker
|
||||||
|
echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$GITEA_USER\",\"password\":\"$GITEA_TOKEN\"}}}" > /kaniko/.docker/config.json
|
||||||
|
|
||||||
|
steps:
|
||||||
|
# === Quality Gates ===
|
||||||
|
|
||||||
|
install:
|
||||||
|
image: *node_image
|
||||||
|
commands:
|
||||||
|
- *install_deps
|
||||||
|
|
||||||
|
security-audit:
|
||||||
|
image: *node_image
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm audit --audit-level=high
|
||||||
|
depends_on:
|
||||||
|
- install
|
||||||
|
|
||||||
|
lint:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
<<: *turbo_env
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm turbo lint --filter=@mosaic/orchestrator
|
||||||
|
depends_on:
|
||||||
|
- install
|
||||||
|
|
||||||
|
typecheck:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
<<: *turbo_env
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm turbo typecheck --filter=@mosaic/orchestrator
|
||||||
|
depends_on:
|
||||||
|
- install
|
||||||
|
|
||||||
|
test:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
<<: *turbo_env
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm turbo test --filter=@mosaic/orchestrator
|
||||||
|
depends_on:
|
||||||
|
- install
|
||||||
|
|
||||||
|
# === Build ===
|
||||||
|
|
||||||
|
build:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
NODE_ENV: "production"
|
||||||
|
<<: *turbo_env
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm turbo build --filter=@mosaic/orchestrator
|
||||||
|
depends_on:
|
||||||
|
- lint
|
||||||
|
- typecheck
|
||||||
|
- test
|
||||||
|
- security-audit
|
||||||
|
|
||||||
|
# === Docker Build & Push ===
|
||||||
|
|
||||||
|
docker-build-orchestrator:
|
||||||
|
image: gcr.io/kaniko-project/executor:debug
|
||||||
|
environment:
|
||||||
|
GITEA_USER:
|
||||||
|
from_secret: gitea_username
|
||||||
|
GITEA_TOKEN:
|
||||||
|
from_secret: gitea_token
|
||||||
|
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
||||||
|
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
||||||
|
commands:
|
||||||
|
- *kaniko_setup
|
||||||
|
- |
|
||||||
|
DESTINATIONS=""
|
||||||
|
if [ -n "$CI_COMMIT_TAG" ]; then
|
||||||
|
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-orchestrator:$CI_COMMIT_TAG"
|
||||||
|
elif [ "$CI_COMMIT_BRANCH" = "main" ]; then
|
||||||
|
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-orchestrator:latest"
|
||||||
|
fi
|
||||||
|
/kaniko/executor --context . --dockerfile apps/orchestrator/Dockerfile --snapshot-mode=redo $DESTINATIONS
|
||||||
|
when:
|
||||||
|
- branch: [main]
|
||||||
|
event: [push, manual, tag]
|
||||||
|
depends_on:
|
||||||
|
- build
|
||||||
|
|
||||||
|
# === Container Security Scan ===
|
||||||
|
|
||||||
|
security-trivy-orchestrator:
|
||||||
|
image: aquasec/trivy:latest
|
||||||
|
environment:
|
||||||
|
GITEA_USER:
|
||||||
|
from_secret: gitea_username
|
||||||
|
GITEA_TOKEN:
|
||||||
|
from_secret: gitea_token
|
||||||
|
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
||||||
|
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
||||||
|
commands:
|
||||||
|
- |
|
||||||
|
if [ -n "$$CI_COMMIT_TAG" ]; then
|
||||||
|
SCAN_TAG="$$CI_COMMIT_TAG"
|
||||||
|
elif [ "$$CI_COMMIT_BRANCH" = "main" ]; then
|
||||||
|
SCAN_TAG="latest"
|
||||||
|
else
|
||||||
|
SCAN_TAG="latest"
|
||||||
|
fi
|
||||||
|
mkdir -p ~/.docker
|
||||||
|
echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$$GITEA_USER\",\"password\":\"$$GITEA_TOKEN\"}}}" > ~/.docker/config.json
|
||||||
|
trivy image --exit-code 1 --severity HIGH,CRITICAL --ignore-unfixed \
|
||||||
|
--ignorefile .trivyignore \
|
||||||
|
git.mosaicstack.dev/mosaic/stack-orchestrator:$$SCAN_TAG
|
||||||
|
when:
|
||||||
|
- branch: [main]
|
||||||
|
event: [push, manual, tag]
|
||||||
|
depends_on:
|
||||||
|
- docker-build-orchestrator
|
||||||
|
|
||||||
|
# === Package Linking ===
|
||||||
|
|
||||||
|
link-packages:
|
||||||
|
image: alpine:3
|
||||||
|
environment:
|
||||||
|
GITEA_TOKEN:
|
||||||
|
from_secret: gitea_token
|
||||||
|
commands:
|
||||||
|
- apk add --no-cache curl
|
||||||
|
- sleep 10
|
||||||
|
- |
|
||||||
|
set -e
|
||||||
|
link_package() {
|
||||||
|
PKG="$$1"
|
||||||
|
echo "Linking $$PKG..."
|
||||||
|
for attempt in 1 2 3; do
|
||||||
|
STATUS=$$(curl -s -o /tmp/link-response.txt -w "%{http_code}" -X POST \
|
||||||
|
-H "Authorization: token $$GITEA_TOKEN" \
|
||||||
|
"https://git.mosaicstack.dev/api/v1/packages/mosaic/container/$$PKG/-/link/stack")
|
||||||
|
if [ "$$STATUS" = "201" ] || [ "$$STATUS" = "204" ]; then
|
||||||
|
echo " Linked $$PKG"
|
||||||
|
return 0
|
||||||
|
elif [ "$$STATUS" = "400" ]; then
|
||||||
|
echo " $$PKG already linked"
|
||||||
|
return 0
|
||||||
|
elif [ "$$STATUS" = "404" ] && [ $$attempt -lt 3 ]; then
|
||||||
|
echo " $$PKG not found yet, retrying in 5s (attempt $$attempt/3)..."
|
||||||
|
sleep 5
|
||||||
|
else
|
||||||
|
echo " FAILED: $$PKG status $$STATUS"
|
||||||
|
cat /tmp/link-response.txt
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
link_package "stack-orchestrator"
|
||||||
|
when:
|
||||||
|
- branch: [main]
|
||||||
|
event: [push, manual, tag]
|
||||||
|
depends_on:
|
||||||
|
- security-trivy-orchestrator
|
||||||
202
.woodpecker/web.yml
Normal file
202
.woodpecker/web.yml
Normal file
@@ -0,0 +1,202 @@
|
|||||||
|
# Web Pipeline - Mosaic Stack
|
||||||
|
# Quality gates, build, and Docker publish for @mosaic/web
|
||||||
|
#
|
||||||
|
# Triggers on: apps/web/**, packages/**, root configs
|
||||||
|
# Security chain: source audit + Trivy container scan
|
||||||
|
|
||||||
|
when:
|
||||||
|
- event: [push, pull_request, manual]
|
||||||
|
path:
|
||||||
|
include:
|
||||||
|
- "apps/web/**"
|
||||||
|
- "packages/**"
|
||||||
|
- "pnpm-lock.yaml"
|
||||||
|
- "pnpm-workspace.yaml"
|
||||||
|
- "turbo.json"
|
||||||
|
- "package.json"
|
||||||
|
- ".woodpecker/web.yml"
|
||||||
|
- ".trivyignore"
|
||||||
|
|
||||||
|
variables:
|
||||||
|
- &node_image "node:24-alpine"
|
||||||
|
- &install_deps |
|
||||||
|
corepack enable
|
||||||
|
pnpm install --frozen-lockfile
|
||||||
|
- &use_deps |
|
||||||
|
corepack enable
|
||||||
|
- &turbo_env
|
||||||
|
TURBO_API:
|
||||||
|
from_secret: turbo_api
|
||||||
|
TURBO_TOKEN:
|
||||||
|
from_secret: turbo_token
|
||||||
|
TURBO_TEAM:
|
||||||
|
from_secret: turbo_team
|
||||||
|
- &kaniko_setup |
|
||||||
|
mkdir -p /kaniko/.docker
|
||||||
|
echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$GITEA_USER\",\"password\":\"$GITEA_TOKEN\"}}}" > /kaniko/.docker/config.json
|
||||||
|
|
||||||
|
steps:
|
||||||
|
# === Quality Gates ===
|
||||||
|
|
||||||
|
install:
|
||||||
|
image: *node_image
|
||||||
|
commands:
|
||||||
|
- *install_deps
|
||||||
|
|
||||||
|
security-audit:
|
||||||
|
image: *node_image
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm audit --audit-level=high
|
||||||
|
depends_on:
|
||||||
|
- install
|
||||||
|
|
||||||
|
lint:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
<<: *turbo_env
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm turbo lint --filter=@mosaic/web
|
||||||
|
depends_on:
|
||||||
|
- install
|
||||||
|
|
||||||
|
typecheck:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
<<: *turbo_env
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm turbo typecheck --filter=@mosaic/web
|
||||||
|
depends_on:
|
||||||
|
- install
|
||||||
|
|
||||||
|
test:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
<<: *turbo_env
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm turbo test --filter=@mosaic/web
|
||||||
|
depends_on:
|
||||||
|
- install
|
||||||
|
|
||||||
|
# === Build ===
|
||||||
|
|
||||||
|
build:
|
||||||
|
image: *node_image
|
||||||
|
environment:
|
||||||
|
SKIP_ENV_VALIDATION: "true"
|
||||||
|
NODE_ENV: "production"
|
||||||
|
<<: *turbo_env
|
||||||
|
commands:
|
||||||
|
- *use_deps
|
||||||
|
- pnpm turbo build --filter=@mosaic/web
|
||||||
|
depends_on:
|
||||||
|
- lint
|
||||||
|
- typecheck
|
||||||
|
- test
|
||||||
|
- security-audit
|
||||||
|
|
||||||
|
# === Docker Build & Push ===
|
||||||
|
|
||||||
|
docker-build-web:
|
||||||
|
image: gcr.io/kaniko-project/executor:debug
|
||||||
|
environment:
|
||||||
|
GITEA_USER:
|
||||||
|
from_secret: gitea_username
|
||||||
|
GITEA_TOKEN:
|
||||||
|
from_secret: gitea_token
|
||||||
|
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
||||||
|
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
||||||
|
commands:
|
||||||
|
- *kaniko_setup
|
||||||
|
- |
|
||||||
|
DESTINATIONS=""
|
||||||
|
if [ -n "$CI_COMMIT_TAG" ]; then
|
||||||
|
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-web:$CI_COMMIT_TAG"
|
||||||
|
elif [ "$CI_COMMIT_BRANCH" = "main" ]; then
|
||||||
|
DESTINATIONS="--destination git.mosaicstack.dev/mosaic/stack-web:latest"
|
||||||
|
fi
|
||||||
|
/kaniko/executor --context . --dockerfile apps/web/Dockerfile --snapshot-mode=redo --build-arg NEXT_PUBLIC_API_URL=https://api.mosaicstack.dev $DESTINATIONS
|
||||||
|
when:
|
||||||
|
- branch: [main]
|
||||||
|
event: [push, manual, tag]
|
||||||
|
depends_on:
|
||||||
|
- build
|
||||||
|
|
||||||
|
# === Container Security Scan ===
|
||||||
|
|
||||||
|
security-trivy-web:
|
||||||
|
image: aquasec/trivy:latest
|
||||||
|
environment:
|
||||||
|
GITEA_USER:
|
||||||
|
from_secret: gitea_username
|
||||||
|
GITEA_TOKEN:
|
||||||
|
from_secret: gitea_token
|
||||||
|
CI_COMMIT_BRANCH: ${CI_COMMIT_BRANCH}
|
||||||
|
CI_COMMIT_TAG: ${CI_COMMIT_TAG}
|
||||||
|
commands:
|
||||||
|
- |
|
||||||
|
if [ -n "$$CI_COMMIT_TAG" ]; then
|
||||||
|
SCAN_TAG="$$CI_COMMIT_TAG"
|
||||||
|
elif [ "$$CI_COMMIT_BRANCH" = "main" ]; then
|
||||||
|
SCAN_TAG="latest"
|
||||||
|
else
|
||||||
|
SCAN_TAG="latest"
|
||||||
|
fi
|
||||||
|
mkdir -p ~/.docker
|
||||||
|
echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$$GITEA_USER\",\"password\":\"$$GITEA_TOKEN\"}}}" > ~/.docker/config.json
|
||||||
|
trivy image --exit-code 1 --severity HIGH,CRITICAL --ignore-unfixed \
|
||||||
|
--ignorefile .trivyignore \
|
||||||
|
git.mosaicstack.dev/mosaic/stack-web:$$SCAN_TAG
|
||||||
|
when:
|
||||||
|
- branch: [main]
|
||||||
|
event: [push, manual, tag]
|
||||||
|
depends_on:
|
||||||
|
- docker-build-web
|
||||||
|
|
||||||
|
# === Package Linking ===
|
||||||
|
|
||||||
|
link-packages:
|
||||||
|
image: alpine:3
|
||||||
|
environment:
|
||||||
|
GITEA_TOKEN:
|
||||||
|
from_secret: gitea_token
|
||||||
|
commands:
|
||||||
|
- apk add --no-cache curl
|
||||||
|
- sleep 10
|
||||||
|
- |
|
||||||
|
set -e
|
||||||
|
link_package() {
|
||||||
|
PKG="$$1"
|
||||||
|
echo "Linking $$PKG..."
|
||||||
|
for attempt in 1 2 3; do
|
||||||
|
STATUS=$$(curl -s -o /tmp/link-response.txt -w "%{http_code}" -X POST \
|
||||||
|
-H "Authorization: token $$GITEA_TOKEN" \
|
||||||
|
"https://git.mosaicstack.dev/api/v1/packages/mosaic/container/$$PKG/-/link/stack")
|
||||||
|
if [ "$$STATUS" = "201" ] || [ "$$STATUS" = "204" ]; then
|
||||||
|
echo " Linked $$PKG"
|
||||||
|
return 0
|
||||||
|
elif [ "$$STATUS" = "400" ]; then
|
||||||
|
echo " $$PKG already linked"
|
||||||
|
return 0
|
||||||
|
elif [ "$$STATUS" = "404" ] && [ $$attempt -lt 3 ]; then
|
||||||
|
echo " $$PKG not found yet, retrying in 5s (attempt $$attempt/3)..."
|
||||||
|
sleep 5
|
||||||
|
else
|
||||||
|
echo " FAILED: $$PKG status $$STATUS"
|
||||||
|
cat /tmp/link-response.txt
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
link_package "stack-web"
|
||||||
|
when:
|
||||||
|
- branch: [main]
|
||||||
|
event: [push, manual, tag]
|
||||||
|
depends_on:
|
||||||
|
- security-trivy-web
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
-- CreateTable
|
|
||||||
CREATE TABLE "agent_memories" (
|
|
||||||
"id" UUID NOT NULL,
|
|
||||||
"workspace_id" UUID NOT NULL,
|
|
||||||
"agent_id" TEXT NOT NULL,
|
|
||||||
"key" TEXT NOT NULL,
|
|
||||||
"value" JSONB NOT NULL,
|
|
||||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updated_at" TIMESTAMPTZ NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "agent_memories_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "agent_memories_workspace_id_agent_id_key_key" ON "agent_memories"("workspace_id", "agent_id", "key");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "agent_memories_workspace_id_idx" ON "agent_memories"("workspace_id");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "agent_memories_agent_id_idx" ON "agent_memories"("agent_id");
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "agent_memories" ADD CONSTRAINT "agent_memories_workspace_id_fkey" FOREIGN KEY ("workspace_id") REFERENCES "workspaces"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
-- CreateTable
|
|
||||||
CREATE TABLE "conversation_archives" (
|
|
||||||
"id" UUID NOT NULL,
|
|
||||||
"workspace_id" UUID NOT NULL,
|
|
||||||
"session_id" TEXT NOT NULL,
|
|
||||||
"agent_id" TEXT NOT NULL,
|
|
||||||
"messages" JSONB NOT NULL,
|
|
||||||
"message_count" INTEGER NOT NULL,
|
|
||||||
"summary" TEXT NOT NULL,
|
|
||||||
"embedding" vector(1536),
|
|
||||||
"started_at" TIMESTAMPTZ NOT NULL,
|
|
||||||
"ended_at" TIMESTAMPTZ,
|
|
||||||
"metadata" JSONB NOT NULL DEFAULT '{}',
|
|
||||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updated_at" TIMESTAMPTZ NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "conversation_archives_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "conversation_archives_workspace_id_session_id_key" ON "conversation_archives"("workspace_id", "session_id");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "conversation_archives_workspace_id_idx" ON "conversation_archives"("workspace_id");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "conversation_archives_agent_id_idx" ON "conversation_archives"("agent_id");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "conversation_archives_started_at_idx" ON "conversation_archives"("started_at");
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "conversation_archives" ADD CONSTRAINT "conversation_archives_workspace_id_fkey" FOREIGN KEY ("workspace_id") REFERENCES "workspaces"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
-- CreateTable
|
|
||||||
CREATE TABLE "findings" (
|
|
||||||
"id" UUID NOT NULL,
|
|
||||||
"workspace_id" UUID NOT NULL,
|
|
||||||
"task_id" UUID,
|
|
||||||
"agent_id" TEXT NOT NULL,
|
|
||||||
"type" TEXT NOT NULL,
|
|
||||||
"title" TEXT NOT NULL,
|
|
||||||
"data" JSONB NOT NULL,
|
|
||||||
"summary" TEXT NOT NULL,
|
|
||||||
"embedding" vector(1536),
|
|
||||||
"created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updated_at" TIMESTAMPTZ NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "findings_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "findings_id_workspace_id_key" ON "findings"("id", "workspace_id");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "findings_workspace_id_idx" ON "findings"("workspace_id");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "findings_agent_id_idx" ON "findings"("agent_id");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "findings_type_idx" ON "findings"("type");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "findings_task_id_idx" ON "findings"("task_id");
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "findings" ADD CONSTRAINT "findings_workspace_id_fkey" FOREIGN KEY ("workspace_id") REFERENCES "workspaces"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "findings" ADD CONSTRAINT "findings_task_id_fkey" FOREIGN KEY ("task_id") REFERENCES "agent_tasks"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
-- AlterTable
|
|
||||||
ALTER TABLE "tasks" ADD COLUMN "assigned_agent" TEXT;
|
|
||||||
@@ -298,8 +298,6 @@ model Workspace {
|
|||||||
agents Agent[]
|
agents Agent[]
|
||||||
agentSessions AgentSession[]
|
agentSessions AgentSession[]
|
||||||
agentTasks AgentTask[]
|
agentTasks AgentTask[]
|
||||||
findings Finding[]
|
|
||||||
agentMemories AgentMemory[]
|
|
||||||
userLayouts UserLayout[]
|
userLayouts UserLayout[]
|
||||||
knowledgeEntries KnowledgeEntry[]
|
knowledgeEntries KnowledgeEntry[]
|
||||||
knowledgeTags KnowledgeTag[]
|
knowledgeTags KnowledgeTag[]
|
||||||
@@ -314,7 +312,6 @@ model Workspace {
|
|||||||
llmUsageLogs LlmUsageLog[]
|
llmUsageLogs LlmUsageLog[]
|
||||||
userCredentials UserCredential[]
|
userCredentials UserCredential[]
|
||||||
terminalSessions TerminalSession[]
|
terminalSessions TerminalSession[]
|
||||||
conversationArchives ConversationArchive[]
|
|
||||||
|
|
||||||
@@index([ownerId])
|
@@index([ownerId])
|
||||||
@@map("workspaces")
|
@@map("workspaces")
|
||||||
@@ -379,7 +376,6 @@ model Task {
|
|||||||
creatorId String @map("creator_id") @db.Uuid
|
creatorId String @map("creator_id") @db.Uuid
|
||||||
projectId String? @map("project_id") @db.Uuid
|
projectId String? @map("project_id") @db.Uuid
|
||||||
parentId String? @map("parent_id") @db.Uuid
|
parentId String? @map("parent_id") @db.Uuid
|
||||||
assignedAgent String? @map("assigned_agent")
|
|
||||||
domainId String? @map("domain_id") @db.Uuid
|
domainId String? @map("domain_id") @db.Uuid
|
||||||
sortOrder Int @default(0) @map("sort_order")
|
sortOrder Int @default(0) @map("sort_order")
|
||||||
metadata Json @default("{}")
|
metadata Json @default("{}")
|
||||||
@@ -693,7 +689,6 @@ model AgentTask {
|
|||||||
createdBy User @relation("AgentTaskCreator", fields: [createdById], references: [id], onDelete: Cascade)
|
createdBy User @relation("AgentTaskCreator", fields: [createdById], references: [id], onDelete: Cascade)
|
||||||
createdById String @map("created_by_id") @db.Uuid
|
createdById String @map("created_by_id") @db.Uuid
|
||||||
runnerJobs RunnerJob[]
|
runnerJobs RunnerJob[]
|
||||||
findings Finding[]
|
|
||||||
|
|
||||||
@@unique([id, workspaceId])
|
@@unique([id, workspaceId])
|
||||||
@@index([workspaceId])
|
@@index([workspaceId])
|
||||||
@@ -703,33 +698,6 @@ model AgentTask {
|
|||||||
@@map("agent_tasks")
|
@@map("agent_tasks")
|
||||||
}
|
}
|
||||||
|
|
||||||
model Finding {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
workspaceId String @map("workspace_id") @db.Uuid
|
|
||||||
taskId String? @map("task_id") @db.Uuid
|
|
||||||
|
|
||||||
agentId String @map("agent_id")
|
|
||||||
type String
|
|
||||||
title String
|
|
||||||
data Json
|
|
||||||
summary String @db.Text
|
|
||||||
// Note: vector dimension (1536) must match EMBEDDING_DIMENSION constant in @mosaic/shared
|
|
||||||
embedding Unsupported("vector(1536)")?
|
|
||||||
|
|
||||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz
|
|
||||||
updatedAt DateTime @updatedAt @map("updated_at") @db.Timestamptz
|
|
||||||
|
|
||||||
workspace Workspace @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
|
|
||||||
task AgentTask? @relation(fields: [taskId], references: [id], onDelete: SetNull)
|
|
||||||
|
|
||||||
@@unique([id, workspaceId])
|
|
||||||
@@index([workspaceId])
|
|
||||||
@@index([agentId])
|
|
||||||
@@index([type])
|
|
||||||
@@index([taskId])
|
|
||||||
@@map("findings")
|
|
||||||
}
|
|
||||||
|
|
||||||
model AgentSession {
|
model AgentSession {
|
||||||
id String @id @default(uuid()) @db.Uuid
|
id String @id @default(uuid()) @db.Uuid
|
||||||
workspaceId String @map("workspace_id") @db.Uuid
|
workspaceId String @map("workspace_id") @db.Uuid
|
||||||
@@ -767,23 +735,6 @@ model AgentSession {
|
|||||||
@@map("agent_sessions")
|
@@map("agent_sessions")
|
||||||
}
|
}
|
||||||
|
|
||||||
model AgentMemory {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
workspaceId String @map("workspace_id") @db.Uuid
|
|
||||||
agentId String @map("agent_id")
|
|
||||||
key String
|
|
||||||
value Json
|
|
||||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz
|
|
||||||
updatedAt DateTime @updatedAt @map("updated_at") @db.Timestamptz
|
|
||||||
|
|
||||||
workspace Workspace @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
|
|
||||||
|
|
||||||
@@unique([workspaceId, agentId, key])
|
|
||||||
@@index([workspaceId])
|
|
||||||
@@index([agentId])
|
|
||||||
@@map("agent_memories")
|
|
||||||
}
|
|
||||||
|
|
||||||
model WidgetDefinition {
|
model WidgetDefinition {
|
||||||
id String @id @default(uuid()) @db.Uuid
|
id String @id @default(uuid()) @db.Uuid
|
||||||
|
|
||||||
@@ -1595,33 +1546,3 @@ model TerminalSession {
|
|||||||
@@index([workspaceId, status])
|
@@index([workspaceId, status])
|
||||||
@@map("terminal_sessions")
|
@@map("terminal_sessions")
|
||||||
}
|
}
|
||||||
|
|
||||||
// ============================================
|
|
||||||
// CONVERSATION ARCHIVE MODULE
|
|
||||||
// ============================================
|
|
||||||
|
|
||||||
model ConversationArchive {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
workspaceId String @map("workspace_id") @db.Uuid
|
|
||||||
sessionId String @map("session_id")
|
|
||||||
agentId String @map("agent_id")
|
|
||||||
messages Json
|
|
||||||
messageCount Int @map("message_count")
|
|
||||||
summary String @db.Text
|
|
||||||
// Note: vector dimension (1536) must match EMBEDDING_DIMENSION constant in @mosaic/shared
|
|
||||||
embedding Unsupported("vector(1536)")?
|
|
||||||
startedAt DateTime @map("started_at") @db.Timestamptz
|
|
||||||
endedAt DateTime? @map("ended_at") @db.Timestamptz
|
|
||||||
metadata Json @default("{}")
|
|
||||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz
|
|
||||||
updatedAt DateTime @updatedAt @map("updated_at") @db.Timestamptz
|
|
||||||
|
|
||||||
// Relations
|
|
||||||
workspace Workspace @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
|
|
||||||
|
|
||||||
@@unique([workspaceId, sessionId])
|
|
||||||
@@index([workspaceId])
|
|
||||||
@@index([agentId])
|
|
||||||
@@index([startedAt])
|
|
||||||
@@map("conversation_archives")
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -24,15 +24,7 @@ describe("AdminService", () => {
|
|||||||
workspaceMember: {
|
workspaceMember: {
|
||||||
create: vi.fn(),
|
create: vi.fn(),
|
||||||
},
|
},
|
||||||
session: {
|
$transaction: vi.fn(),
|
||||||
deleteMany: vi.fn(),
|
|
||||||
},
|
|
||||||
$transaction: vi.fn(async (ops) => {
|
|
||||||
if (typeof ops === "function") {
|
|
||||||
return ops(mockPrismaService);
|
|
||||||
}
|
|
||||||
return Promise.all(ops);
|
|
||||||
}),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const mockAdminId = "550e8400-e29b-41d4-a716-446655440001";
|
const mockAdminId = "550e8400-e29b-41d4-a716-446655440001";
|
||||||
@@ -90,6 +82,10 @@ describe("AdminService", () => {
|
|||||||
service = module.get<AdminService>(AdminService);
|
service = module.get<AdminService>(AdminService);
|
||||||
|
|
||||||
vi.clearAllMocks();
|
vi.clearAllMocks();
|
||||||
|
|
||||||
|
mockPrismaService.$transaction.mockImplementation(async (fn: (tx: unknown) => unknown) => {
|
||||||
|
return fn(mockPrismaService);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should be defined", () => {
|
it("should be defined", () => {
|
||||||
@@ -329,13 +325,12 @@ describe("AdminService", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
describe("deactivateUser", () => {
|
describe("deactivateUser", () => {
|
||||||
it("should set deactivatedAt and invalidate sessions", async () => {
|
it("should set deactivatedAt on the user", async () => {
|
||||||
mockPrismaService.user.findUnique.mockResolvedValue(mockUser);
|
mockPrismaService.user.findUnique.mockResolvedValue(mockUser);
|
||||||
mockPrismaService.user.update.mockResolvedValue({
|
mockPrismaService.user.update.mockResolvedValue({
|
||||||
...mockUser,
|
...mockUser,
|
||||||
deactivatedAt: new Date(),
|
deactivatedAt: new Date(),
|
||||||
});
|
});
|
||||||
mockPrismaService.session.deleteMany.mockResolvedValue({ count: 3 });
|
|
||||||
|
|
||||||
const result = await service.deactivateUser(mockUserId);
|
const result = await service.deactivateUser(mockUserId);
|
||||||
|
|
||||||
@@ -346,7 +341,6 @@ describe("AdminService", () => {
|
|||||||
data: { deactivatedAt: expect.any(Date) },
|
data: { deactivatedAt: expect.any(Date) },
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
expect(mockPrismaService.session.deleteMany).toHaveBeenCalledWith({ where: { userId: mockUserId } });
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should throw NotFoundException if user does not exist", async () => {
|
it("should throw NotFoundException if user does not exist", async () => {
|
||||||
|
|||||||
@@ -192,22 +192,19 @@ export class AdminService {
|
|||||||
throw new BadRequestException(`User ${id} is already deactivated`);
|
throw new BadRequestException(`User ${id} is already deactivated`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const [user] = await this.prisma.$transaction([
|
const user = await this.prisma.user.update({
|
||||||
this.prisma.user.update({
|
where: { id },
|
||||||
where: { id },
|
data: { deactivatedAt: new Date() },
|
||||||
data: { deactivatedAt: new Date() },
|
include: {
|
||||||
include: {
|
workspaceMemberships: {
|
||||||
workspaceMemberships: {
|
include: {
|
||||||
include: {
|
workspace: { select: { id: true, name: true } },
|
||||||
workspace: { select: { id: true, name: true } },
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}),
|
},
|
||||||
this.prisma.session.deleteMany({ where: { userId: id } }),
|
});
|
||||||
]);
|
|
||||||
|
|
||||||
this.logger.log(`User deactivated and sessions invalidated: ${id}`);
|
this.logger.log(`User deactivated: ${id}`);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: user.id,
|
id: user.id,
|
||||||
|
|||||||
@@ -1,102 +0,0 @@
|
|||||||
import { Test, TestingModule } from "@nestjs/testing";
|
|
||||||
import { AgentMemoryController } from "./agent-memory.controller";
|
|
||||||
import { AgentMemoryService } from "./agent-memory.service";
|
|
||||||
import { AuthGuard } from "../auth/guards/auth.guard";
|
|
||||||
import { WorkspaceGuard, PermissionGuard } from "../common/guards";
|
|
||||||
import { describe, it, expect, beforeEach, vi } from "vitest";
|
|
||||||
|
|
||||||
describe("AgentMemoryController", () => {
|
|
||||||
let controller: AgentMemoryController;
|
|
||||||
|
|
||||||
const mockAgentMemoryService = {
|
|
||||||
upsert: vi.fn(),
|
|
||||||
findAll: vi.fn(),
|
|
||||||
findOne: vi.fn(),
|
|
||||||
remove: vi.fn(),
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockGuard = { canActivate: vi.fn(() => true) };
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
|
||||||
controllers: [AgentMemoryController],
|
|
||||||
providers: [
|
|
||||||
{
|
|
||||||
provide: AgentMemoryService,
|
|
||||||
useValue: mockAgentMemoryService,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
.overrideGuard(AuthGuard)
|
|
||||||
.useValue(mockGuard)
|
|
||||||
.overrideGuard(WorkspaceGuard)
|
|
||||||
.useValue(mockGuard)
|
|
||||||
.overrideGuard(PermissionGuard)
|
|
||||||
.useValue(mockGuard)
|
|
||||||
.compile();
|
|
||||||
|
|
||||||
controller = module.get<AgentMemoryController>(AgentMemoryController);
|
|
||||||
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
const workspaceId = "workspace-1";
|
|
||||||
const agentId = "agent-1";
|
|
||||||
const key = "context";
|
|
||||||
|
|
||||||
describe("upsert", () => {
|
|
||||||
it("should upsert a memory entry", async () => {
|
|
||||||
const dto = { value: { foo: "bar" } };
|
|
||||||
const mockEntry = { id: "mem-1", workspaceId, agentId, key, value: dto.value };
|
|
||||||
|
|
||||||
mockAgentMemoryService.upsert.mockResolvedValue(mockEntry);
|
|
||||||
|
|
||||||
const result = await controller.upsert(agentId, key, dto, workspaceId);
|
|
||||||
|
|
||||||
expect(mockAgentMemoryService.upsert).toHaveBeenCalledWith(workspaceId, agentId, key, dto);
|
|
||||||
expect(result).toEqual(mockEntry);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findAll", () => {
|
|
||||||
it("should list all memory entries for an agent", async () => {
|
|
||||||
const mockEntries = [
|
|
||||||
{ id: "mem-1", key: "a", value: 1 },
|
|
||||||
{ id: "mem-2", key: "b", value: 2 },
|
|
||||||
];
|
|
||||||
|
|
||||||
mockAgentMemoryService.findAll.mockResolvedValue(mockEntries);
|
|
||||||
|
|
||||||
const result = await controller.findAll(agentId, workspaceId);
|
|
||||||
|
|
||||||
expect(mockAgentMemoryService.findAll).toHaveBeenCalledWith(workspaceId, agentId);
|
|
||||||
expect(result).toEqual(mockEntries);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findOne", () => {
|
|
||||||
it("should get a single memory entry", async () => {
|
|
||||||
const mockEntry = { id: "mem-1", key, value: "v" };
|
|
||||||
|
|
||||||
mockAgentMemoryService.findOne.mockResolvedValue(mockEntry);
|
|
||||||
|
|
||||||
const result = await controller.findOne(agentId, key, workspaceId);
|
|
||||||
|
|
||||||
expect(mockAgentMemoryService.findOne).toHaveBeenCalledWith(workspaceId, agentId, key);
|
|
||||||
expect(result).toEqual(mockEntry);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("remove", () => {
|
|
||||||
it("should delete a memory entry", async () => {
|
|
||||||
const mockResponse = { message: "Memory entry deleted successfully" };
|
|
||||||
|
|
||||||
mockAgentMemoryService.remove.mockResolvedValue(mockResponse);
|
|
||||||
|
|
||||||
const result = await controller.remove(agentId, key, workspaceId);
|
|
||||||
|
|
||||||
expect(mockAgentMemoryService.remove).toHaveBeenCalledWith(workspaceId, agentId, key);
|
|
||||||
expect(result).toEqual(mockResponse);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
import {
|
|
||||||
Controller,
|
|
||||||
Get,
|
|
||||||
Put,
|
|
||||||
Delete,
|
|
||||||
Body,
|
|
||||||
Param,
|
|
||||||
UseGuards,
|
|
||||||
HttpCode,
|
|
||||||
HttpStatus,
|
|
||||||
} from "@nestjs/common";
|
|
||||||
import { AgentMemoryService } from "./agent-memory.service";
|
|
||||||
import { UpsertAgentMemoryDto } from "./dto";
|
|
||||||
import { AuthGuard } from "../auth/guards/auth.guard";
|
|
||||||
import { WorkspaceGuard, PermissionGuard } from "../common/guards";
|
|
||||||
import { Workspace, Permission, RequirePermission } from "../common/decorators";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Controller for per-agent key/value memory endpoints.
|
|
||||||
* All endpoints require authentication and workspace context.
|
|
||||||
*
|
|
||||||
* Guards are applied in order:
|
|
||||||
* 1. AuthGuard - Verifies user authentication
|
|
||||||
* 2. WorkspaceGuard - Validates workspace access
|
|
||||||
* 3. PermissionGuard - Checks role-based permissions
|
|
||||||
*/
|
|
||||||
@Controller("agents/:agentId/memory")
|
|
||||||
@UseGuards(AuthGuard, WorkspaceGuard, PermissionGuard)
|
|
||||||
export class AgentMemoryController {
|
|
||||||
constructor(private readonly agentMemoryService: AgentMemoryService) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* PUT /api/agents/:agentId/memory/:key
|
|
||||||
* Upsert a memory entry for an agent
|
|
||||||
* Requires: MEMBER role or higher
|
|
||||||
*/
|
|
||||||
@Put(":key")
|
|
||||||
@RequirePermission(Permission.WORKSPACE_MEMBER)
|
|
||||||
async upsert(
|
|
||||||
@Param("agentId") agentId: string,
|
|
||||||
@Param("key") key: string,
|
|
||||||
@Body() dto: UpsertAgentMemoryDto,
|
|
||||||
@Workspace() workspaceId: string
|
|
||||||
) {
|
|
||||||
return this.agentMemoryService.upsert(workspaceId, agentId, key, dto);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GET /api/agents/:agentId/memory
|
|
||||||
* List all memory entries for an agent
|
|
||||||
* Requires: Any workspace member (including GUEST)
|
|
||||||
*/
|
|
||||||
@Get()
|
|
||||||
@RequirePermission(Permission.WORKSPACE_ANY)
|
|
||||||
async findAll(@Param("agentId") agentId: string, @Workspace() workspaceId: string) {
|
|
||||||
return this.agentMemoryService.findAll(workspaceId, agentId);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GET /api/agents/:agentId/memory/:key
|
|
||||||
* Get a single memory entry by key
|
|
||||||
* Requires: Any workspace member (including GUEST)
|
|
||||||
*/
|
|
||||||
@Get(":key")
|
|
||||||
@RequirePermission(Permission.WORKSPACE_ANY)
|
|
||||||
async findOne(
|
|
||||||
@Param("agentId") agentId: string,
|
|
||||||
@Param("key") key: string,
|
|
||||||
@Workspace() workspaceId: string
|
|
||||||
) {
|
|
||||||
return this.agentMemoryService.findOne(workspaceId, agentId, key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DELETE /api/agents/:agentId/memory/:key
|
|
||||||
* Remove a memory entry
|
|
||||||
* Requires: MEMBER role or higher
|
|
||||||
*/
|
|
||||||
@Delete(":key")
|
|
||||||
@HttpCode(HttpStatus.OK)
|
|
||||||
@RequirePermission(Permission.WORKSPACE_MEMBER)
|
|
||||||
async remove(
|
|
||||||
@Param("agentId") agentId: string,
|
|
||||||
@Param("key") key: string,
|
|
||||||
@Workspace() workspaceId: string
|
|
||||||
) {
|
|
||||||
return this.agentMemoryService.remove(workspaceId, agentId, key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import { Module } from "@nestjs/common";
|
|
||||||
import { AgentMemoryController } from "./agent-memory.controller";
|
|
||||||
import { AgentMemoryService } from "./agent-memory.service";
|
|
||||||
import { PrismaModule } from "../prisma/prisma.module";
|
|
||||||
import { AuthModule } from "../auth/auth.module";
|
|
||||||
|
|
||||||
@Module({
|
|
||||||
imports: [PrismaModule, AuthModule],
|
|
||||||
controllers: [AgentMemoryController],
|
|
||||||
providers: [AgentMemoryService],
|
|
||||||
exports: [AgentMemoryService],
|
|
||||||
})
|
|
||||||
export class AgentMemoryModule {}
|
|
||||||
@@ -1,126 +0,0 @@
|
|||||||
import { Test, TestingModule } from "@nestjs/testing";
|
|
||||||
import { AgentMemoryService } from "./agent-memory.service";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import { NotFoundException } from "@nestjs/common";
|
|
||||||
import { describe, it, expect, beforeEach, vi } from "vitest";
|
|
||||||
|
|
||||||
describe("AgentMemoryService", () => {
|
|
||||||
let service: AgentMemoryService;
|
|
||||||
|
|
||||||
const mockPrismaService = {
|
|
||||||
agentMemory: {
|
|
||||||
upsert: vi.fn(),
|
|
||||||
findMany: vi.fn(),
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
delete: vi.fn(),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
|
||||||
providers: [
|
|
||||||
AgentMemoryService,
|
|
||||||
{
|
|
||||||
provide: PrismaService,
|
|
||||||
useValue: mockPrismaService,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}).compile();
|
|
||||||
|
|
||||||
service = module.get<AgentMemoryService>(AgentMemoryService);
|
|
||||||
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
const workspaceId = "workspace-1";
|
|
||||||
const agentId = "agent-1";
|
|
||||||
const key = "session-context";
|
|
||||||
|
|
||||||
describe("upsert", () => {
|
|
||||||
it("should upsert a memory entry", async () => {
|
|
||||||
const dto = { value: { data: "some context" } };
|
|
||||||
const mockEntry = {
|
|
||||||
id: "mem-1",
|
|
||||||
workspaceId,
|
|
||||||
agentId,
|
|
||||||
key,
|
|
||||||
value: dto.value,
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
};
|
|
||||||
|
|
||||||
mockPrismaService.agentMemory.upsert.mockResolvedValue(mockEntry);
|
|
||||||
|
|
||||||
const result = await service.upsert(workspaceId, agentId, key, dto);
|
|
||||||
|
|
||||||
expect(mockPrismaService.agentMemory.upsert).toHaveBeenCalledWith({
|
|
||||||
where: { workspaceId_agentId_key: { workspaceId, agentId, key } },
|
|
||||||
create: { workspaceId, agentId, key, value: dto.value },
|
|
||||||
update: { value: dto.value },
|
|
||||||
});
|
|
||||||
expect(result).toEqual(mockEntry);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findAll", () => {
|
|
||||||
it("should return all memory entries for an agent", async () => {
|
|
||||||
const mockEntries = [
|
|
||||||
{ id: "mem-1", key: "a", value: 1 },
|
|
||||||
{ id: "mem-2", key: "b", value: 2 },
|
|
||||||
];
|
|
||||||
|
|
||||||
mockPrismaService.agentMemory.findMany.mockResolvedValue(mockEntries);
|
|
||||||
|
|
||||||
const result = await service.findAll(workspaceId, agentId);
|
|
||||||
|
|
||||||
expect(mockPrismaService.agentMemory.findMany).toHaveBeenCalledWith({
|
|
||||||
where: { workspaceId, agentId },
|
|
||||||
orderBy: { key: "asc" },
|
|
||||||
});
|
|
||||||
expect(result).toEqual(mockEntries);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findOne", () => {
|
|
||||||
it("should return a memory entry by key", async () => {
|
|
||||||
const mockEntry = { id: "mem-1", workspaceId, agentId, key, value: "ctx" };
|
|
||||||
|
|
||||||
mockPrismaService.agentMemory.findUnique.mockResolvedValue(mockEntry);
|
|
||||||
|
|
||||||
const result = await service.findOne(workspaceId, agentId, key);
|
|
||||||
|
|
||||||
expect(mockPrismaService.agentMemory.findUnique).toHaveBeenCalledWith({
|
|
||||||
where: { workspaceId_agentId_key: { workspaceId, agentId, key } },
|
|
||||||
});
|
|
||||||
expect(result).toEqual(mockEntry);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw NotFoundException when key not found", async () => {
|
|
||||||
mockPrismaService.agentMemory.findUnique.mockResolvedValue(null);
|
|
||||||
|
|
||||||
await expect(service.findOne(workspaceId, agentId, key)).rejects.toThrow(NotFoundException);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("remove", () => {
|
|
||||||
it("should delete a memory entry", async () => {
|
|
||||||
const mockEntry = { id: "mem-1", workspaceId, agentId, key, value: "x" };
|
|
||||||
|
|
||||||
mockPrismaService.agentMemory.findUnique.mockResolvedValue(mockEntry);
|
|
||||||
mockPrismaService.agentMemory.delete.mockResolvedValue(mockEntry);
|
|
||||||
|
|
||||||
const result = await service.remove(workspaceId, agentId, key);
|
|
||||||
|
|
||||||
expect(mockPrismaService.agentMemory.delete).toHaveBeenCalledWith({
|
|
||||||
where: { workspaceId_agentId_key: { workspaceId, agentId, key } },
|
|
||||||
});
|
|
||||||
expect(result).toEqual({ message: "Memory entry deleted successfully" });
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw NotFoundException when key not found", async () => {
|
|
||||||
mockPrismaService.agentMemory.findUnique.mockResolvedValue(null);
|
|
||||||
|
|
||||||
await expect(service.remove(workspaceId, agentId, key)).rejects.toThrow(NotFoundException);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
import { Injectable, NotFoundException } from "@nestjs/common";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import { Prisma } from "@prisma/client";
|
|
||||||
import type { UpsertAgentMemoryDto } from "./dto";
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class AgentMemoryService {
|
|
||||||
constructor(private readonly prisma: PrismaService) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Upsert a memory entry for an agent.
|
|
||||||
*/
|
|
||||||
async upsert(workspaceId: string, agentId: string, key: string, dto: UpsertAgentMemoryDto) {
|
|
||||||
return this.prisma.agentMemory.upsert({
|
|
||||||
where: {
|
|
||||||
workspaceId_agentId_key: { workspaceId, agentId, key },
|
|
||||||
},
|
|
||||||
create: {
|
|
||||||
workspaceId,
|
|
||||||
agentId,
|
|
||||||
key,
|
|
||||||
value: dto.value as Prisma.InputJsonValue,
|
|
||||||
},
|
|
||||||
update: {
|
|
||||||
value: dto.value as Prisma.InputJsonValue,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* List all memory entries for an agent in a workspace.
|
|
||||||
*/
|
|
||||||
async findAll(workspaceId: string, agentId: string) {
|
|
||||||
return this.prisma.agentMemory.findMany({
|
|
||||||
where: { workspaceId, agentId },
|
|
||||||
orderBy: { key: "asc" },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a single memory entry by key.
|
|
||||||
*/
|
|
||||||
async findOne(workspaceId: string, agentId: string, key: string) {
|
|
||||||
const entry = await this.prisma.agentMemory.findUnique({
|
|
||||||
where: {
|
|
||||||
workspaceId_agentId_key: { workspaceId, agentId, key },
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!entry) {
|
|
||||||
throw new NotFoundException(`Memory key "${key}" not found for agent "${agentId}"`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return entry;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Delete a memory entry by key.
|
|
||||||
*/
|
|
||||||
async remove(workspaceId: string, agentId: string, key: string) {
|
|
||||||
const entry = await this.prisma.agentMemory.findUnique({
|
|
||||||
where: {
|
|
||||||
workspaceId_agentId_key: { workspaceId, agentId, key },
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!entry) {
|
|
||||||
throw new NotFoundException(`Memory key "${key}" not found for agent "${agentId}"`);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.prisma.agentMemory.delete({
|
|
||||||
where: {
|
|
||||||
workspaceId_agentId_key: { workspaceId, agentId, key },
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return { message: "Memory entry deleted successfully" };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export * from "./upsert-agent-memory.dto";
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
import { IsNotEmpty } from "class-validator";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DTO for upserting an agent memory entry.
|
|
||||||
* The value accepts any JSON-serializable data.
|
|
||||||
*/
|
|
||||||
export class UpsertAgentMemoryDto {
|
|
||||||
@IsNotEmpty({ message: "value must not be empty" })
|
|
||||||
value!: unknown;
|
|
||||||
}
|
|
||||||
@@ -27,8 +27,6 @@ import { LlmUsageModule } from "./llm-usage/llm-usage.module";
|
|||||||
import { BrainModule } from "./brain/brain.module";
|
import { BrainModule } from "./brain/brain.module";
|
||||||
import { CronModule } from "./cron/cron.module";
|
import { CronModule } from "./cron/cron.module";
|
||||||
import { AgentTasksModule } from "./agent-tasks/agent-tasks.module";
|
import { AgentTasksModule } from "./agent-tasks/agent-tasks.module";
|
||||||
import { FindingsModule } from "./findings/findings.module";
|
|
||||||
import { AgentMemoryModule } from "./agent-memory/agent-memory.module";
|
|
||||||
import { ValkeyModule } from "./valkey/valkey.module";
|
import { ValkeyModule } from "./valkey/valkey.module";
|
||||||
import { BullMqModule } from "./bullmq/bullmq.module";
|
import { BullMqModule } from "./bullmq/bullmq.module";
|
||||||
import { StitcherModule } from "./stitcher/stitcher.module";
|
import { StitcherModule } from "./stitcher/stitcher.module";
|
||||||
@@ -47,8 +45,6 @@ import { PersonalitiesModule } from "./personalities/personalities.module";
|
|||||||
import { WorkspacesModule } from "./workspaces/workspaces.module";
|
import { WorkspacesModule } from "./workspaces/workspaces.module";
|
||||||
import { AdminModule } from "./admin/admin.module";
|
import { AdminModule } from "./admin/admin.module";
|
||||||
import { TeamsModule } from "./teams/teams.module";
|
import { TeamsModule } from "./teams/teams.module";
|
||||||
import { ImportModule } from "./import/import.module";
|
|
||||||
import { ConversationArchiveModule } from "./conversation-archive/conversation-archive.module";
|
|
||||||
import { RlsContextInterceptor } from "./common/interceptors/rls-context.interceptor";
|
import { RlsContextInterceptor } from "./common/interceptors/rls-context.interceptor";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
@@ -103,8 +99,6 @@ import { RlsContextInterceptor } from "./common/interceptors/rls-context.interce
|
|||||||
BrainModule,
|
BrainModule,
|
||||||
CronModule,
|
CronModule,
|
||||||
AgentTasksModule,
|
AgentTasksModule,
|
||||||
FindingsModule,
|
|
||||||
AgentMemoryModule,
|
|
||||||
RunnerJobsModule,
|
RunnerJobsModule,
|
||||||
JobEventsModule,
|
JobEventsModule,
|
||||||
JobStepsModule,
|
JobStepsModule,
|
||||||
@@ -119,8 +113,6 @@ import { RlsContextInterceptor } from "./common/interceptors/rls-context.interce
|
|||||||
WorkspacesModule,
|
WorkspacesModule,
|
||||||
AdminModule,
|
AdminModule,
|
||||||
TeamsModule,
|
TeamsModule,
|
||||||
ImportModule,
|
|
||||||
ConversationArchiveModule,
|
|
||||||
],
|
],
|
||||||
controllers: [AppController, CsrfController],
|
controllers: [AppController, CsrfController],
|
||||||
providers: [
|
providers: [
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
import { Controller, Post, Get, Body, Param, Query, UseGuards } from "@nestjs/common";
|
|
||||||
import { AuthGuard } from "../auth/guards/auth.guard";
|
|
||||||
import { WorkspaceGuard, PermissionGuard } from "../common/guards";
|
|
||||||
import { Workspace, RequirePermission, Permission } from "../common/decorators";
|
|
||||||
import { ConversationArchiveService } from "./conversation-archive.service";
|
|
||||||
import { IngestConversationDto, SearchConversationDto, ListConversationsDto } from "./dto";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Controller for conversation archive endpoints.
|
|
||||||
* All endpoints require workspace membership.
|
|
||||||
*/
|
|
||||||
@Controller("conversations")
|
|
||||||
@UseGuards(AuthGuard, WorkspaceGuard, PermissionGuard)
|
|
||||||
export class ConversationArchiveController {
|
|
||||||
constructor(private readonly service: ConversationArchiveService) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* POST /api/conversations/ingest
|
|
||||||
* Ingest a conversation session log and auto-embed for semantic search.
|
|
||||||
* Requires: MEMBER or higher
|
|
||||||
*/
|
|
||||||
@Post("ingest")
|
|
||||||
@RequirePermission(Permission.WORKSPACE_MEMBER)
|
|
||||||
async ingest(
|
|
||||||
@Workspace() workspaceId: string,
|
|
||||||
@Body() dto: IngestConversationDto
|
|
||||||
): Promise<{ id: string }> {
|
|
||||||
return this.service.ingest(workspaceId, dto);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* POST /api/conversations/search
|
|
||||||
* Vector similarity search across archived conversations.
|
|
||||||
* Requires: Any workspace member
|
|
||||||
*/
|
|
||||||
@Post("search")
|
|
||||||
@RequirePermission(Permission.WORKSPACE_ANY)
|
|
||||||
async search(
|
|
||||||
@Workspace() workspaceId: string,
|
|
||||||
@Body() dto: SearchConversationDto
|
|
||||||
): Promise<unknown> {
|
|
||||||
return this.service.search(workspaceId, dto);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GET /api/conversations
|
|
||||||
* List conversation archives with filtering and pagination.
|
|
||||||
* Requires: Any workspace member
|
|
||||||
*/
|
|
||||||
@Get()
|
|
||||||
@RequirePermission(Permission.WORKSPACE_ANY)
|
|
||||||
async findAll(
|
|
||||||
@Workspace() workspaceId: string,
|
|
||||||
@Query() query: ListConversationsDto
|
|
||||||
): Promise<unknown> {
|
|
||||||
return this.service.findAll(workspaceId, query);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GET /api/conversations/:id
|
|
||||||
* Get a single conversation archive by ID (includes full messages).
|
|
||||||
* Requires: Any workspace member
|
|
||||||
*/
|
|
||||||
@Get(":id")
|
|
||||||
@RequirePermission(Permission.WORKSPACE_ANY)
|
|
||||||
async findOne(@Workspace() workspaceId: string, @Param("id") id: string): Promise<unknown> {
|
|
||||||
return this.service.findOne(workspaceId, id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import { Module } from "@nestjs/common";
|
|
||||||
import { PrismaModule } from "../prisma/prisma.module";
|
|
||||||
import { AuthModule } from "../auth/auth.module";
|
|
||||||
import { KnowledgeModule } from "../knowledge/knowledge.module";
|
|
||||||
import { ConversationArchiveService } from "./conversation-archive.service";
|
|
||||||
import { ConversationArchiveController } from "./conversation-archive.controller";
|
|
||||||
|
|
||||||
@Module({
|
|
||||||
imports: [PrismaModule, AuthModule, KnowledgeModule],
|
|
||||||
controllers: [ConversationArchiveController],
|
|
||||||
providers: [ConversationArchiveService],
|
|
||||||
exports: [ConversationArchiveService],
|
|
||||||
})
|
|
||||||
export class ConversationArchiveModule {}
|
|
||||||
@@ -1,149 +0,0 @@
|
|||||||
import { describe, it, expect, beforeEach, vi } from "vitest";
|
|
||||||
import { Test, TestingModule } from "@nestjs/testing";
|
|
||||||
import { ConflictException, NotFoundException } from "@nestjs/common";
|
|
||||||
import { ConversationArchiveService } from "./conversation-archive.service";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import { EmbeddingService } from "../knowledge/services/embedding.service";
|
|
||||||
|
|
||||||
const mockPrisma = {
|
|
||||||
conversationArchive: {
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
create: vi.fn(),
|
|
||||||
count: vi.fn(),
|
|
||||||
findMany: vi.fn(),
|
|
||||||
findFirst: vi.fn(),
|
|
||||||
},
|
|
||||||
$queryRaw: vi.fn(),
|
|
||||||
$executeRaw: vi.fn(),
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockEmbedding = {
|
|
||||||
isConfigured: vi.fn(),
|
|
||||||
generateEmbedding: vi.fn(),
|
|
||||||
};
|
|
||||||
|
|
||||||
describe("ConversationArchiveService", () => {
|
|
||||||
let service: ConversationArchiveService;
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
|
||||||
providers: [
|
|
||||||
ConversationArchiveService,
|
|
||||||
{ provide: PrismaService, useValue: mockPrisma },
|
|
||||||
{ provide: EmbeddingService, useValue: mockEmbedding },
|
|
||||||
],
|
|
||||||
}).compile();
|
|
||||||
|
|
||||||
service = module.get<ConversationArchiveService>(ConversationArchiveService);
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("ingest", () => {
|
|
||||||
const workspaceId = "ws-1";
|
|
||||||
const dto = {
|
|
||||||
sessionId: "sess-abc",
|
|
||||||
agentId: "agent-xyz",
|
|
||||||
messages: [
|
|
||||||
{ role: "user", content: "Hello" },
|
|
||||||
{ role: "assistant", content: "Hi there!" },
|
|
||||||
],
|
|
||||||
summary: "A greeting conversation",
|
|
||||||
startedAt: "2026-02-28T10:00:00Z",
|
|
||||||
};
|
|
||||||
|
|
||||||
it("creates a conversation archive and returns id", async () => {
|
|
||||||
mockPrisma.conversationArchive.findUnique.mockResolvedValue(null);
|
|
||||||
mockPrisma.conversationArchive.create.mockResolvedValue({ id: "conv-1" });
|
|
||||||
mockEmbedding.isConfigured.mockReturnValue(false);
|
|
||||||
|
|
||||||
const result = await service.ingest(workspaceId, dto);
|
|
||||||
|
|
||||||
expect(result).toEqual({ id: "conv-1" });
|
|
||||||
expect(mockPrisma.conversationArchive.create).toHaveBeenCalledWith(
|
|
||||||
expect.objectContaining({
|
|
||||||
data: expect.objectContaining({
|
|
||||||
workspaceId,
|
|
||||||
sessionId: dto.sessionId,
|
|
||||||
agentId: dto.agentId,
|
|
||||||
messageCount: 2,
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("throws ConflictException when session already exists", async () => {
|
|
||||||
mockPrisma.conversationArchive.findUnique.mockResolvedValue({ id: "existing" });
|
|
||||||
|
|
||||||
await expect(service.ingest(workspaceId, dto)).rejects.toThrow(ConflictException);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findAll", () => {
|
|
||||||
const workspaceId = "ws-1";
|
|
||||||
|
|
||||||
it("returns paginated list", async () => {
|
|
||||||
mockPrisma.conversationArchive.count.mockResolvedValue(5);
|
|
||||||
mockPrisma.conversationArchive.findMany.mockResolvedValue([
|
|
||||||
{ id: "conv-1", sessionId: "sess-1" },
|
|
||||||
]);
|
|
||||||
|
|
||||||
const result = await service.findAll(workspaceId, { page: 1, limit: 10 });
|
|
||||||
|
|
||||||
expect(result.pagination.total).toBe(5);
|
|
||||||
expect(result.data).toHaveLength(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("uses default pagination when not provided", async () => {
|
|
||||||
mockPrisma.conversationArchive.count.mockResolvedValue(0);
|
|
||||||
mockPrisma.conversationArchive.findMany.mockResolvedValue([]);
|
|
||||||
|
|
||||||
const result = await service.findAll(workspaceId, {});
|
|
||||||
|
|
||||||
expect(result.pagination.page).toBe(1);
|
|
||||||
expect(result.pagination.limit).toBe(20);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findOne", () => {
|
|
||||||
const workspaceId = "ws-1";
|
|
||||||
|
|
||||||
it("returns record when found", async () => {
|
|
||||||
const record = { id: "conv-1", workspaceId, sessionId: "sess-1" };
|
|
||||||
mockPrisma.conversationArchive.findFirst.mockResolvedValue(record);
|
|
||||||
|
|
||||||
const result = await service.findOne(workspaceId, "conv-1");
|
|
||||||
|
|
||||||
expect(result).toEqual(record);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("throws NotFoundException when record does not exist", async () => {
|
|
||||||
mockPrisma.conversationArchive.findFirst.mockResolvedValue(null);
|
|
||||||
|
|
||||||
await expect(service.findOne(workspaceId, "missing")).rejects.toThrow(NotFoundException);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("search", () => {
|
|
||||||
it("throws ConflictException when embedding is not configured", async () => {
|
|
||||||
mockEmbedding.isConfigured.mockReturnValue(false);
|
|
||||||
|
|
||||||
await expect(service.search("ws-1", { query: "test query" })).rejects.toThrow(
|
|
||||||
ConflictException
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("performs vector search when configured", async () => {
|
|
||||||
mockEmbedding.isConfigured.mockReturnValue(true);
|
|
||||||
mockEmbedding.generateEmbedding.mockResolvedValue(new Array(1536).fill(0.1));
|
|
||||||
mockPrisma.$queryRaw
|
|
||||||
.mockResolvedValueOnce([{ id: "conv-1", similarity: 0.9 }])
|
|
||||||
.mockResolvedValueOnce([{ count: BigInt(1) }]);
|
|
||||||
|
|
||||||
const result = await service.search("ws-1", { query: "greetings" });
|
|
||||||
|
|
||||||
expect(result.data).toHaveLength(1);
|
|
||||||
expect(result.pagination.total).toBe(1);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,277 +0,0 @@
|
|||||||
import { Injectable, Logger, NotFoundException, ConflictException } from "@nestjs/common";
|
|
||||||
import { Prisma } from "@prisma/client";
|
|
||||||
import { EMBEDDING_DIMENSION } from "@mosaic/shared";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import { EmbeddingService } from "../knowledge/services/embedding.service";
|
|
||||||
import type { IngestConversationDto, SearchConversationDto, ListConversationsDto } from "./dto";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Shape of a raw conversation archive row from $queryRaw vector search
|
|
||||||
*/
|
|
||||||
interface RawConversationResult {
|
|
||||||
id: string;
|
|
||||||
workspace_id: string;
|
|
||||||
session_id: string;
|
|
||||||
agent_id: string;
|
|
||||||
messages: unknown;
|
|
||||||
message_count: number;
|
|
||||||
summary: string;
|
|
||||||
started_at: Date;
|
|
||||||
ended_at: Date | null;
|
|
||||||
metadata: unknown;
|
|
||||||
created_at: Date;
|
|
||||||
updated_at: Date;
|
|
||||||
similarity: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Paginated response wrapper
|
|
||||||
*/
|
|
||||||
export interface PaginatedConversations<T> {
|
|
||||||
data: T[];
|
|
||||||
pagination: {
|
|
||||||
page: number;
|
|
||||||
limit: number;
|
|
||||||
total: number;
|
|
||||||
totalPages: number;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class ConversationArchiveService {
|
|
||||||
private readonly logger = new Logger(ConversationArchiveService.name);
|
|
||||||
private readonly defaultSimilarityThreshold = 0.5;
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private readonly prisma: PrismaService,
|
|
||||||
private readonly embedding: EmbeddingService
|
|
||||||
) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Ingest a conversation session log.
|
|
||||||
* Generates a vector embedding from the summary + message content and stores it alongside the record.
|
|
||||||
*/
|
|
||||||
async ingest(workspaceId: string, dto: IngestConversationDto): Promise<{ id: string }> {
|
|
||||||
// Verify no duplicate session in this workspace
|
|
||||||
const existing = await this.prisma.conversationArchive.findUnique({
|
|
||||||
where: { workspaceId_sessionId: { workspaceId, sessionId: dto.sessionId } },
|
|
||||||
select: { id: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (existing) {
|
|
||||||
throw new ConflictException(
|
|
||||||
`Conversation session '${dto.sessionId}' already exists in this workspace`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const messageCount = dto.messages.length;
|
|
||||||
|
|
||||||
// Create record first to get ID for embedding
|
|
||||||
const record = await this.prisma.conversationArchive.create({
|
|
||||||
data: {
|
|
||||||
workspaceId,
|
|
||||||
sessionId: dto.sessionId,
|
|
||||||
agentId: dto.agentId,
|
|
||||||
messages: dto.messages as unknown as Prisma.InputJsonValue,
|
|
||||||
messageCount,
|
|
||||||
summary: dto.summary,
|
|
||||||
startedAt: new Date(dto.startedAt),
|
|
||||||
endedAt: dto.endedAt ? new Date(dto.endedAt) : null,
|
|
||||||
metadata: (dto.metadata ?? {}) as Prisma.InputJsonValue,
|
|
||||||
},
|
|
||||||
select: { id: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
// Generate and store embedding asynchronously (non-blocking for ingest)
|
|
||||||
if (this.embedding.isConfigured()) {
|
|
||||||
const textForEmbedding = this.buildEmbeddingText(dto.summary, dto.messages);
|
|
||||||
this.storeEmbedding(record.id, textForEmbedding).catch((err: unknown) => {
|
|
||||||
this.logger.error(`Failed to store embedding for conversation ${record.id}`, err);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
this.logger.log(`Ingested conversation ${record.id} (session: ${dto.sessionId})`);
|
|
||||||
return { id: record.id };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Semantic vector search across conversation archives in a workspace.
|
|
||||||
*/
|
|
||||||
async search(
|
|
||||||
workspaceId: string,
|
|
||||||
dto: SearchConversationDto
|
|
||||||
): Promise<PaginatedConversations<RawConversationResult>> {
|
|
||||||
if (!this.embedding.isConfigured()) {
|
|
||||||
throw new ConflictException("Semantic search requires OpenAI API key to be configured");
|
|
||||||
}
|
|
||||||
|
|
||||||
const limit = dto.limit ?? 20;
|
|
||||||
const threshold = dto.similarityThreshold ?? this.defaultSimilarityThreshold;
|
|
||||||
const distanceThreshold = 1 - threshold;
|
|
||||||
|
|
||||||
const queryEmbedding = await this.embedding.generateEmbedding(dto.query);
|
|
||||||
const embeddingStr = `[${queryEmbedding.join(",")}]`;
|
|
||||||
|
|
||||||
const agentFilter = dto.agentId ? Prisma.sql`AND ca.agent_id = ${dto.agentId}` : Prisma.sql``;
|
|
||||||
|
|
||||||
const rows = await this.prisma.$queryRaw<RawConversationResult[]>`
|
|
||||||
SELECT
|
|
||||||
ca.id,
|
|
||||||
ca.workspace_id,
|
|
||||||
ca.session_id,
|
|
||||||
ca.agent_id,
|
|
||||||
ca.messages,
|
|
||||||
ca.message_count,
|
|
||||||
ca.summary,
|
|
||||||
ca.started_at,
|
|
||||||
ca.ended_at,
|
|
||||||
ca.metadata,
|
|
||||||
ca.created_at,
|
|
||||||
ca.updated_at,
|
|
||||||
(1 - (ca.embedding <=> ${embeddingStr}::vector(${EMBEDDING_DIMENSION}))) AS similarity
|
|
||||||
FROM conversation_archives ca
|
|
||||||
WHERE ca.workspace_id = ${workspaceId}::uuid
|
|
||||||
AND ca.embedding IS NOT NULL
|
|
||||||
AND (ca.embedding <=> ${embeddingStr}::vector(${EMBEDDING_DIMENSION})) <= ${distanceThreshold}
|
|
||||||
${agentFilter}
|
|
||||||
ORDER BY ca.embedding <=> ${embeddingStr}::vector(${EMBEDDING_DIMENSION})
|
|
||||||
LIMIT ${limit}
|
|
||||||
`;
|
|
||||||
|
|
||||||
const countResult = await this.prisma.$queryRaw<[{ count: bigint }]>`
|
|
||||||
SELECT COUNT(*) AS count
|
|
||||||
FROM conversation_archives ca
|
|
||||||
WHERE ca.workspace_id = ${workspaceId}::uuid
|
|
||||||
AND ca.embedding IS NOT NULL
|
|
||||||
AND (ca.embedding <=> ${embeddingStr}::vector(${EMBEDDING_DIMENSION})) <= ${distanceThreshold}
|
|
||||||
${agentFilter}
|
|
||||||
`;
|
|
||||||
|
|
||||||
const total = Number(countResult[0].count);
|
|
||||||
|
|
||||||
return {
|
|
||||||
data: rows,
|
|
||||||
pagination: {
|
|
||||||
page: 1,
|
|
||||||
limit,
|
|
||||||
total,
|
|
||||||
totalPages: Math.ceil(total / limit),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* List conversation archives with filtering and pagination.
|
|
||||||
*/
|
|
||||||
async findAll(
|
|
||||||
workspaceId: string,
|
|
||||||
query: ListConversationsDto
|
|
||||||
): Promise<PaginatedConversations<object>> {
|
|
||||||
const page = query.page ?? 1;
|
|
||||||
const limit = query.limit ?? 20;
|
|
||||||
const skip = (page - 1) * limit;
|
|
||||||
|
|
||||||
const where: Prisma.ConversationArchiveWhereInput = {
|
|
||||||
workspaceId,
|
|
||||||
...(query.agentId ? { agentId: query.agentId } : {}),
|
|
||||||
...(query.startedAfter || query.startedBefore
|
|
||||||
? {
|
|
||||||
startedAt: {
|
|
||||||
...(query.startedAfter ? { gte: new Date(query.startedAfter) } : {}),
|
|
||||||
...(query.startedBefore ? { lte: new Date(query.startedBefore) } : {}),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
: {}),
|
|
||||||
};
|
|
||||||
|
|
||||||
const [total, records] = await Promise.all([
|
|
||||||
this.prisma.conversationArchive.count({ where }),
|
|
||||||
this.prisma.conversationArchive.findMany({
|
|
||||||
where,
|
|
||||||
select: {
|
|
||||||
id: true,
|
|
||||||
workspaceId: true,
|
|
||||||
sessionId: true,
|
|
||||||
agentId: true,
|
|
||||||
messageCount: true,
|
|
||||||
summary: true,
|
|
||||||
startedAt: true,
|
|
||||||
endedAt: true,
|
|
||||||
metadata: true,
|
|
||||||
createdAt: true,
|
|
||||||
updatedAt: true,
|
|
||||||
},
|
|
||||||
orderBy: { startedAt: "desc" },
|
|
||||||
skip,
|
|
||||||
take: limit,
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
|
|
||||||
return {
|
|
||||||
data: records,
|
|
||||||
pagination: {
|
|
||||||
page,
|
|
||||||
limit,
|
|
||||||
total,
|
|
||||||
totalPages: Math.ceil(total / limit),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a single conversation archive by ID.
|
|
||||||
*/
|
|
||||||
async findOne(workspaceId: string, id: string): Promise<object> {
|
|
||||||
const record = await this.prisma.conversationArchive.findFirst({
|
|
||||||
where: { id, workspaceId },
|
|
||||||
select: {
|
|
||||||
id: true,
|
|
||||||
workspaceId: true,
|
|
||||||
sessionId: true,
|
|
||||||
agentId: true,
|
|
||||||
messages: true,
|
|
||||||
messageCount: true,
|
|
||||||
summary: true,
|
|
||||||
startedAt: true,
|
|
||||||
endedAt: true,
|
|
||||||
metadata: true,
|
|
||||||
createdAt: true,
|
|
||||||
updatedAt: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!record) {
|
|
||||||
throw new NotFoundException(`Conversation archive '${id}' not found`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return record;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Build text content for embedding from summary and messages.
|
|
||||||
*/
|
|
||||||
private buildEmbeddingText(
|
|
||||||
summary: string,
|
|
||||||
messages: { role: string; content: string }[]
|
|
||||||
): string {
|
|
||||||
const messageText = messages.map((m) => `${m.role}: ${m.content}`).join("\n");
|
|
||||||
return `${summary}\n\n${messageText}`.trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate embedding and store it on the conversation_archives row.
|
|
||||||
*/
|
|
||||||
private async storeEmbedding(id: string, text: string): Promise<void> {
|
|
||||||
const vector = await this.embedding.generateEmbedding(text);
|
|
||||||
const embeddingStr = `[${vector.join(",")}]`;
|
|
||||||
|
|
||||||
await this.prisma.$executeRaw`
|
|
||||||
UPDATE conversation_archives
|
|
||||||
SET embedding = ${embeddingStr}::vector(${EMBEDDING_DIMENSION}),
|
|
||||||
updated_at = NOW()
|
|
||||||
WHERE id = ${id}::uuid
|
|
||||||
`;
|
|
||||||
|
|
||||||
this.logger.log(`Stored embedding for conversation ${id}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export { IngestConversationDto, ConversationMessageDto } from "./ingest-conversation.dto";
|
|
||||||
export { SearchConversationDto } from "./search-conversation.dto";
|
|
||||||
export { ListConversationsDto } from "./list-conversations.dto";
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
import {
|
|
||||||
IsString,
|
|
||||||
IsArray,
|
|
||||||
IsOptional,
|
|
||||||
IsDateString,
|
|
||||||
MinLength,
|
|
||||||
MaxLength,
|
|
||||||
IsObject,
|
|
||||||
ValidateNested,
|
|
||||||
ArrayMinSize,
|
|
||||||
} from "class-validator";
|
|
||||||
import { Type } from "class-transformer";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents a single message in a conversation session
|
|
||||||
*/
|
|
||||||
export class ConversationMessageDto {
|
|
||||||
@IsString()
|
|
||||||
role!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@MinLength(1)
|
|
||||||
content!: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsDateString()
|
|
||||||
timestamp?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DTO for ingesting a conversation session log
|
|
||||||
*/
|
|
||||||
export class IngestConversationDto {
|
|
||||||
@IsString()
|
|
||||||
@MinLength(1)
|
|
||||||
@MaxLength(500)
|
|
||||||
sessionId!: string;
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@MinLength(1)
|
|
||||||
@MaxLength(500)
|
|
||||||
agentId!: string;
|
|
||||||
|
|
||||||
@IsArray()
|
|
||||||
@ArrayMinSize(1)
|
|
||||||
@ValidateNested({ each: true })
|
|
||||||
@Type(() => ConversationMessageDto)
|
|
||||||
messages!: ConversationMessageDto[];
|
|
||||||
|
|
||||||
@IsString()
|
|
||||||
@MinLength(1)
|
|
||||||
summary!: string;
|
|
||||||
|
|
||||||
@IsDateString()
|
|
||||||
startedAt!: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsDateString()
|
|
||||||
endedAt?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsObject()
|
|
||||||
metadata?: Record<string, unknown>;
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import { IsString, IsOptional, MaxLength, IsInt, Min, Max, IsDateString } from "class-validator";
|
|
||||||
import { Type } from "class-transformer";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DTO for listing/filtering conversation archives
|
|
||||||
*/
|
|
||||||
export class ListConversationsDto {
|
|
||||||
@IsOptional()
|
|
||||||
@IsString()
|
|
||||||
@MaxLength(500)
|
|
||||||
agentId?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsDateString()
|
|
||||||
startedAfter?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsDateString()
|
|
||||||
startedBefore?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Type(() => Number)
|
|
||||||
@IsInt()
|
|
||||||
@Min(1)
|
|
||||||
page?: number;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Type(() => Number)
|
|
||||||
@IsInt()
|
|
||||||
@Min(1)
|
|
||||||
@Max(100)
|
|
||||||
limit?: number;
|
|
||||||
}
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
import {
|
|
||||||
IsString,
|
|
||||||
IsOptional,
|
|
||||||
MinLength,
|
|
||||||
MaxLength,
|
|
||||||
IsInt,
|
|
||||||
Min,
|
|
||||||
Max,
|
|
||||||
IsNumber,
|
|
||||||
} from "class-validator";
|
|
||||||
import { Type } from "class-transformer";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DTO for semantic search across conversation archives
|
|
||||||
*/
|
|
||||||
export class SearchConversationDto {
|
|
||||||
@IsString()
|
|
||||||
@MinLength(1)
|
|
||||||
@MaxLength(1000)
|
|
||||||
query!: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString()
|
|
||||||
@MaxLength(500)
|
|
||||||
agentId?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Type(() => Number)
|
|
||||||
@IsInt()
|
|
||||||
@Min(1)
|
|
||||||
@Max(100)
|
|
||||||
limit?: number;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Type(() => Number)
|
|
||||||
@IsNumber()
|
|
||||||
@Min(0)
|
|
||||||
@Max(1)
|
|
||||||
similarityThreshold?: number;
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import { IsObject, IsOptional, IsString, IsUUID, MaxLength, MinLength } from "class-validator";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DTO for creating a finding
|
|
||||||
*/
|
|
||||||
export class CreateFindingDto {
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID("4", { message: "taskId must be a valid UUID" })
|
|
||||||
taskId?: string;
|
|
||||||
|
|
||||||
@IsString({ message: "agentId must be a string" })
|
|
||||||
@MinLength(1, { message: "agentId must not be empty" })
|
|
||||||
@MaxLength(255, { message: "agentId must not exceed 255 characters" })
|
|
||||||
agentId!: string;
|
|
||||||
|
|
||||||
@IsString({ message: "type must be a string" })
|
|
||||||
@MinLength(1, { message: "type must not be empty" })
|
|
||||||
@MaxLength(100, { message: "type must not exceed 100 characters" })
|
|
||||||
type!: string;
|
|
||||||
|
|
||||||
@IsString({ message: "title must be a string" })
|
|
||||||
@MinLength(1, { message: "title must not be empty" })
|
|
||||||
@MaxLength(255, { message: "title must not exceed 255 characters" })
|
|
||||||
title!: string;
|
|
||||||
|
|
||||||
@IsObject({ message: "data must be an object" })
|
|
||||||
data!: Record<string, unknown>;
|
|
||||||
|
|
||||||
@IsString({ message: "summary must be a string" })
|
|
||||||
@MinLength(1, { message: "summary must not be empty" })
|
|
||||||
@MaxLength(20000, { message: "summary must not exceed 20000 characters" })
|
|
||||||
summary!: string;
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export { CreateFindingDto } from "./create-finding.dto";
|
|
||||||
export { QueryFindingsDto } from "./query-findings.dto";
|
|
||||||
export { SearchFindingsDto } from "./search-findings.dto";
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
import { Type } from "class-transformer";
|
|
||||||
import { IsInt, IsOptional, IsString, IsUUID, Max, Min } from "class-validator";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DTO for querying findings with filters and pagination
|
|
||||||
*/
|
|
||||||
export class QueryFindingsDto {
|
|
||||||
@IsOptional()
|
|
||||||
@Type(() => Number)
|
|
||||||
@IsInt({ message: "page must be an integer" })
|
|
||||||
@Min(1, { message: "page must be at least 1" })
|
|
||||||
page?: number;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Type(() => Number)
|
|
||||||
@IsInt({ message: "limit must be an integer" })
|
|
||||||
@Min(1, { message: "limit must be at least 1" })
|
|
||||||
@Max(100, { message: "limit must not exceed 100" })
|
|
||||||
limit?: number;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "agentId must be a string" })
|
|
||||||
agentId?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "type must be a string" })
|
|
||||||
type?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID("4", { message: "taskId must be a valid UUID" })
|
|
||||||
taskId?: string;
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
import { Type } from "class-transformer";
|
|
||||||
import {
|
|
||||||
IsInt,
|
|
||||||
IsNumber,
|
|
||||||
IsOptional,
|
|
||||||
IsString,
|
|
||||||
IsUUID,
|
|
||||||
Max,
|
|
||||||
MaxLength,
|
|
||||||
Min,
|
|
||||||
} from "class-validator";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DTO for finding semantic similarity search
|
|
||||||
*/
|
|
||||||
export class SearchFindingsDto {
|
|
||||||
@IsString({ message: "query must be a string" })
|
|
||||||
@MaxLength(1000, { message: "query must not exceed 1000 characters" })
|
|
||||||
query!: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Type(() => Number)
|
|
||||||
@IsInt({ message: "page must be an integer" })
|
|
||||||
@Min(1, { message: "page must be at least 1" })
|
|
||||||
page?: number;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Type(() => Number)
|
|
||||||
@IsInt({ message: "limit must be an integer" })
|
|
||||||
@Min(1, { message: "limit must be at least 1" })
|
|
||||||
@Max(100, { message: "limit must not exceed 100" })
|
|
||||||
limit?: number;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@Type(() => Number)
|
|
||||||
@IsNumber({}, { message: "similarityThreshold must be a number" })
|
|
||||||
@Min(0, { message: "similarityThreshold must be at least 0" })
|
|
||||||
@Max(1, { message: "similarityThreshold must not exceed 1" })
|
|
||||||
similarityThreshold?: number;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "agentId must be a string" })
|
|
||||||
agentId?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "type must be a string" })
|
|
||||||
type?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID("4", { message: "taskId must be a valid UUID" })
|
|
||||||
taskId?: string;
|
|
||||||
}
|
|
||||||
@@ -1,195 +0,0 @@
|
|||||||
import { Test, TestingModule } from "@nestjs/testing";
|
|
||||||
import { describe, it, expect, beforeEach, vi } from "vitest";
|
|
||||||
import { FindingsController } from "./findings.controller";
|
|
||||||
import { FindingsService } from "./findings.service";
|
|
||||||
import { AuthGuard } from "../auth/guards/auth.guard";
|
|
||||||
import { WorkspaceGuard, PermissionGuard } from "../common/guards";
|
|
||||||
import { CreateFindingDto, QueryFindingsDto, SearchFindingsDto } from "./dto";
|
|
||||||
|
|
||||||
describe("FindingsController", () => {
|
|
||||||
let controller: FindingsController;
|
|
||||||
let service: FindingsService;
|
|
||||||
|
|
||||||
const mockFindingsService = {
|
|
||||||
create: vi.fn(),
|
|
||||||
findAll: vi.fn(),
|
|
||||||
findOne: vi.fn(),
|
|
||||||
search: vi.fn(),
|
|
||||||
remove: vi.fn(),
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockAuthGuard = {
|
|
||||||
canActivate: vi.fn(() => true),
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockWorkspaceGuard = {
|
|
||||||
canActivate: vi.fn(() => true),
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockPermissionGuard = {
|
|
||||||
canActivate: vi.fn(() => true),
|
|
||||||
};
|
|
||||||
|
|
||||||
const workspaceId = "550e8400-e29b-41d4-a716-446655440001";
|
|
||||||
const findingId = "550e8400-e29b-41d4-a716-446655440002";
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
|
||||||
controllers: [FindingsController],
|
|
||||||
providers: [
|
|
||||||
{
|
|
||||||
provide: FindingsService,
|
|
||||||
useValue: mockFindingsService,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
.overrideGuard(AuthGuard)
|
|
||||||
.useValue(mockAuthGuard)
|
|
||||||
.overrideGuard(WorkspaceGuard)
|
|
||||||
.useValue(mockWorkspaceGuard)
|
|
||||||
.overrideGuard(PermissionGuard)
|
|
||||||
.useValue(mockPermissionGuard)
|
|
||||||
.compile();
|
|
||||||
|
|
||||||
controller = module.get<FindingsController>(FindingsController);
|
|
||||||
service = module.get<FindingsService>(FindingsService);
|
|
||||||
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should be defined", () => {
|
|
||||||
expect(controller).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("create", () => {
|
|
||||||
it("should create a finding", async () => {
|
|
||||||
const createDto: CreateFindingDto = {
|
|
||||||
agentId: "research-agent",
|
|
||||||
type: "security",
|
|
||||||
title: "SQL injection risk",
|
|
||||||
data: { severity: "high" },
|
|
||||||
summary: "Potential SQL injection in search endpoint.",
|
|
||||||
};
|
|
||||||
|
|
||||||
const createdFinding = {
|
|
||||||
id: findingId,
|
|
||||||
workspaceId,
|
|
||||||
taskId: null,
|
|
||||||
...createDto,
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
};
|
|
||||||
|
|
||||||
mockFindingsService.create.mockResolvedValue(createdFinding);
|
|
||||||
|
|
||||||
const result = await controller.create(createDto, workspaceId);
|
|
||||||
|
|
||||||
expect(result).toEqual(createdFinding);
|
|
||||||
expect(service.create).toHaveBeenCalledWith(workspaceId, createDto);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findAll", () => {
|
|
||||||
it("should return paginated findings", async () => {
|
|
||||||
const query: QueryFindingsDto = {
|
|
||||||
page: 1,
|
|
||||||
limit: 10,
|
|
||||||
type: "security",
|
|
||||||
};
|
|
||||||
|
|
||||||
const response = {
|
|
||||||
data: [],
|
|
||||||
meta: {
|
|
||||||
total: 0,
|
|
||||||
page: 1,
|
|
||||||
limit: 10,
|
|
||||||
totalPages: 0,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
mockFindingsService.findAll.mockResolvedValue(response);
|
|
||||||
|
|
||||||
const result = await controller.findAll(query, workspaceId);
|
|
||||||
|
|
||||||
expect(result).toEqual(response);
|
|
||||||
expect(service.findAll).toHaveBeenCalledWith(workspaceId, query);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findOne", () => {
|
|
||||||
it("should return a finding", async () => {
|
|
||||||
const finding = {
|
|
||||||
id: findingId,
|
|
||||||
workspaceId,
|
|
||||||
taskId: null,
|
|
||||||
agentId: "research-agent",
|
|
||||||
type: "security",
|
|
||||||
title: "SQL injection risk",
|
|
||||||
data: { severity: "high" },
|
|
||||||
summary: "Potential SQL injection in search endpoint.",
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
};
|
|
||||||
|
|
||||||
mockFindingsService.findOne.mockResolvedValue(finding);
|
|
||||||
|
|
||||||
const result = await controller.findOne(findingId, workspaceId);
|
|
||||||
|
|
||||||
expect(result).toEqual(finding);
|
|
||||||
expect(service.findOne).toHaveBeenCalledWith(findingId, workspaceId);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("search", () => {
|
|
||||||
it("should perform semantic search", async () => {
|
|
||||||
const searchDto: SearchFindingsDto = {
|
|
||||||
query: "sql injection",
|
|
||||||
limit: 5,
|
|
||||||
};
|
|
||||||
|
|
||||||
const response = {
|
|
||||||
data: [
|
|
||||||
{
|
|
||||||
id: findingId,
|
|
||||||
workspaceId,
|
|
||||||
taskId: null,
|
|
||||||
agentId: "research-agent",
|
|
||||||
type: "security",
|
|
||||||
title: "SQL injection risk",
|
|
||||||
data: { severity: "high" },
|
|
||||||
summary: "Potential SQL injection in search endpoint.",
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
score: 0.91,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
meta: {
|
|
||||||
total: 1,
|
|
||||||
page: 1,
|
|
||||||
limit: 5,
|
|
||||||
totalPages: 1,
|
|
||||||
},
|
|
||||||
query: "sql injection",
|
|
||||||
};
|
|
||||||
|
|
||||||
mockFindingsService.search.mockResolvedValue(response);
|
|
||||||
|
|
||||||
const result = await controller.search(searchDto, workspaceId);
|
|
||||||
|
|
||||||
expect(result).toEqual(response);
|
|
||||||
expect(service.search).toHaveBeenCalledWith(workspaceId, searchDto);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("remove", () => {
|
|
||||||
it("should delete a finding", async () => {
|
|
||||||
const response = { message: "Finding deleted successfully" };
|
|
||||||
mockFindingsService.remove.mockResolvedValue(response);
|
|
||||||
|
|
||||||
const result = await controller.remove(findingId, workspaceId);
|
|
||||||
|
|
||||||
expect(result).toEqual(response);
|
|
||||||
expect(service.remove).toHaveBeenCalledWith(findingId, workspaceId);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
import { Body, Controller, Delete, Get, Param, Post, Query, UseGuards } from "@nestjs/common";
|
|
||||||
import { AuthGuard } from "../auth/guards/auth.guard";
|
|
||||||
import { WorkspaceGuard, PermissionGuard } from "../common/guards";
|
|
||||||
import { Workspace, Permission, RequirePermission } from "../common/decorators";
|
|
||||||
import { CreateFindingDto, QueryFindingsDto, SearchFindingsDto } from "./dto";
|
|
||||||
import {
|
|
||||||
FindingsService,
|
|
||||||
FindingsSearchResponse,
|
|
||||||
PaginatedFindingsResponse,
|
|
||||||
} from "./findings.service";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Controller for findings endpoints
|
|
||||||
* All endpoints require authentication and workspace context
|
|
||||||
*/
|
|
||||||
@Controller("findings")
|
|
||||||
@UseGuards(AuthGuard, WorkspaceGuard, PermissionGuard)
|
|
||||||
export class FindingsController {
|
|
||||||
constructor(private readonly findingsService: FindingsService) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* POST /api/findings
|
|
||||||
* Create a new finding and embed its summary
|
|
||||||
* Requires: MEMBER role or higher
|
|
||||||
*/
|
|
||||||
@Post()
|
|
||||||
@RequirePermission(Permission.WORKSPACE_MEMBER)
|
|
||||||
async create(@Body() createFindingDto: CreateFindingDto, @Workspace() workspaceId: string) {
|
|
||||||
return this.findingsService.create(workspaceId, createFindingDto);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GET /api/findings
|
|
||||||
* Get paginated findings with optional filters
|
|
||||||
* Requires: Any workspace member
|
|
||||||
*/
|
|
||||||
@Get()
|
|
||||||
@RequirePermission(Permission.WORKSPACE_ANY)
|
|
||||||
async findAll(
|
|
||||||
@Query() query: QueryFindingsDto,
|
|
||||||
@Workspace() workspaceId: string
|
|
||||||
): Promise<PaginatedFindingsResponse> {
|
|
||||||
return this.findingsService.findAll(workspaceId, query);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GET /api/findings/:id
|
|
||||||
* Get a single finding by ID
|
|
||||||
* Requires: Any workspace member
|
|
||||||
*/
|
|
||||||
@Get(":id")
|
|
||||||
@RequirePermission(Permission.WORKSPACE_ANY)
|
|
||||||
async findOne(@Param("id") id: string, @Workspace() workspaceId: string) {
|
|
||||||
return this.findingsService.findOne(id, workspaceId);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* POST /api/findings/search
|
|
||||||
* Semantic search findings by vector similarity
|
|
||||||
* Requires: Any workspace member
|
|
||||||
*/
|
|
||||||
@Post("search")
|
|
||||||
@RequirePermission(Permission.WORKSPACE_ANY)
|
|
||||||
async search(
|
|
||||||
@Body() searchDto: SearchFindingsDto,
|
|
||||||
@Workspace() workspaceId: string
|
|
||||||
): Promise<FindingsSearchResponse> {
|
|
||||||
return this.findingsService.search(workspaceId, searchDto);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DELETE /api/findings/:id
|
|
||||||
* Delete a finding
|
|
||||||
* Requires: ADMIN role or higher
|
|
||||||
*/
|
|
||||||
@Delete(":id")
|
|
||||||
@RequirePermission(Permission.WORKSPACE_ADMIN)
|
|
||||||
async remove(@Param("id") id: string, @Workspace() workspaceId: string) {
|
|
||||||
return this.findingsService.remove(id, workspaceId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import { Module } from "@nestjs/common";
|
|
||||||
import { PrismaModule } from "../prisma/prisma.module";
|
|
||||||
import { AuthModule } from "../auth/auth.module";
|
|
||||||
import { KnowledgeModule } from "../knowledge/knowledge.module";
|
|
||||||
import { FindingsController } from "./findings.controller";
|
|
||||||
import { FindingsService } from "./findings.service";
|
|
||||||
|
|
||||||
@Module({
|
|
||||||
imports: [PrismaModule, AuthModule, KnowledgeModule],
|
|
||||||
controllers: [FindingsController],
|
|
||||||
providers: [FindingsService],
|
|
||||||
exports: [FindingsService],
|
|
||||||
})
|
|
||||||
export class FindingsModule {}
|
|
||||||
@@ -1,300 +0,0 @@
|
|||||||
import { Test, TestingModule } from "@nestjs/testing";
|
|
||||||
import { describe, it, expect, beforeEach, vi } from "vitest";
|
|
||||||
import { BadRequestException, NotFoundException } from "@nestjs/common";
|
|
||||||
import { FindingsService } from "./findings.service";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import { EmbeddingService } from "../knowledge/services/embedding.service";
|
|
||||||
|
|
||||||
describe("FindingsService", () => {
|
|
||||||
let service: FindingsService;
|
|
||||||
let prisma: PrismaService;
|
|
||||||
let embeddingService: EmbeddingService;
|
|
||||||
|
|
||||||
const mockWorkspaceId = "550e8400-e29b-41d4-a716-446655440001";
|
|
||||||
const mockFindingId = "550e8400-e29b-41d4-a716-446655440002";
|
|
||||||
const mockTaskId = "550e8400-e29b-41d4-a716-446655440003";
|
|
||||||
|
|
||||||
const mockPrismaService = {
|
|
||||||
finding: {
|
|
||||||
create: vi.fn(),
|
|
||||||
findMany: vi.fn(),
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
count: vi.fn(),
|
|
||||||
delete: vi.fn(),
|
|
||||||
},
|
|
||||||
agentTask: {
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
},
|
|
||||||
$queryRaw: vi.fn(),
|
|
||||||
$executeRaw: vi.fn(),
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockEmbeddingService = {
|
|
||||||
isConfigured: vi.fn(),
|
|
||||||
generateEmbedding: vi.fn(),
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
|
||||||
providers: [
|
|
||||||
FindingsService,
|
|
||||||
{
|
|
||||||
provide: PrismaService,
|
|
||||||
useValue: mockPrismaService,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
provide: EmbeddingService,
|
|
||||||
useValue: mockEmbeddingService,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}).compile();
|
|
||||||
|
|
||||||
service = module.get<FindingsService>(FindingsService);
|
|
||||||
prisma = module.get<PrismaService>(PrismaService);
|
|
||||||
embeddingService = module.get<EmbeddingService>(EmbeddingService);
|
|
||||||
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should be defined", () => {
|
|
||||||
expect(service).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("create", () => {
|
|
||||||
it("should create a finding and store embedding when configured", async () => {
|
|
||||||
const createDto = {
|
|
||||||
taskId: mockTaskId,
|
|
||||||
agentId: "research-agent",
|
|
||||||
type: "security",
|
|
||||||
title: "SQL injection risk",
|
|
||||||
data: { severity: "high" },
|
|
||||||
summary: "Potential SQL injection in search endpoint.",
|
|
||||||
};
|
|
||||||
|
|
||||||
const createdFinding = {
|
|
||||||
id: mockFindingId,
|
|
||||||
workspaceId: mockWorkspaceId,
|
|
||||||
...createDto,
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
};
|
|
||||||
|
|
||||||
mockPrismaService.agentTask.findUnique.mockResolvedValue({
|
|
||||||
id: mockTaskId,
|
|
||||||
workspaceId: mockWorkspaceId,
|
|
||||||
});
|
|
||||||
mockPrismaService.finding.create.mockResolvedValue(createdFinding);
|
|
||||||
mockPrismaService.finding.findUnique.mockResolvedValue(createdFinding);
|
|
||||||
mockEmbeddingService.isConfigured.mockReturnValue(true);
|
|
||||||
mockEmbeddingService.generateEmbedding.mockResolvedValue([0.1, 0.2, 0.3]);
|
|
||||||
mockPrismaService.$executeRaw.mockResolvedValue(1);
|
|
||||||
|
|
||||||
const result = await service.create(mockWorkspaceId, createDto);
|
|
||||||
|
|
||||||
expect(result).toEqual(createdFinding);
|
|
||||||
expect(prisma.finding.create).toHaveBeenCalledWith({
|
|
||||||
data: expect.objectContaining({
|
|
||||||
workspaceId: mockWorkspaceId,
|
|
||||||
taskId: mockTaskId,
|
|
||||||
agentId: "research-agent",
|
|
||||||
type: "security",
|
|
||||||
title: "SQL injection risk",
|
|
||||||
}),
|
|
||||||
select: expect.any(Object),
|
|
||||||
});
|
|
||||||
expect(embeddingService.generateEmbedding).toHaveBeenCalledWith(createDto.summary);
|
|
||||||
expect(prisma.$executeRaw).toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should create a finding without embedding when not configured", async () => {
|
|
||||||
const createDto = {
|
|
||||||
agentId: "research-agent",
|
|
||||||
type: "security",
|
|
||||||
title: "SQL injection risk",
|
|
||||||
data: { severity: "high" },
|
|
||||||
summary: "Potential SQL injection in search endpoint.",
|
|
||||||
};
|
|
||||||
|
|
||||||
const createdFinding = {
|
|
||||||
id: mockFindingId,
|
|
||||||
workspaceId: mockWorkspaceId,
|
|
||||||
taskId: null,
|
|
||||||
...createDto,
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
};
|
|
||||||
|
|
||||||
mockPrismaService.finding.create.mockResolvedValue(createdFinding);
|
|
||||||
mockEmbeddingService.isConfigured.mockReturnValue(false);
|
|
||||||
|
|
||||||
const result = await service.create(mockWorkspaceId, createDto);
|
|
||||||
|
|
||||||
expect(result).toEqual(createdFinding);
|
|
||||||
expect(embeddingService.generateEmbedding).not.toHaveBeenCalled();
|
|
||||||
expect(prisma.$executeRaw).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findAll", () => {
|
|
||||||
it("should return paginated findings with filters", async () => {
|
|
||||||
const findings = [
|
|
||||||
{
|
|
||||||
id: mockFindingId,
|
|
||||||
workspaceId: mockWorkspaceId,
|
|
||||||
taskId: null,
|
|
||||||
agentId: "research-agent",
|
|
||||||
type: "security",
|
|
||||||
title: "SQL injection risk",
|
|
||||||
data: { severity: "high" },
|
|
||||||
summary: "Potential SQL injection in search endpoint.",
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
mockPrismaService.finding.findMany.mockResolvedValue(findings);
|
|
||||||
mockPrismaService.finding.count.mockResolvedValue(1);
|
|
||||||
|
|
||||||
const result = await service.findAll(mockWorkspaceId, {
|
|
||||||
page: 1,
|
|
||||||
limit: 10,
|
|
||||||
type: "security",
|
|
||||||
agentId: "research-agent",
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(result).toEqual({
|
|
||||||
data: findings,
|
|
||||||
meta: {
|
|
||||||
total: 1,
|
|
||||||
page: 1,
|
|
||||||
limit: 10,
|
|
||||||
totalPages: 1,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
expect(prisma.finding.findMany).toHaveBeenCalledWith(
|
|
||||||
expect.objectContaining({
|
|
||||||
where: {
|
|
||||||
workspaceId: mockWorkspaceId,
|
|
||||||
type: "security",
|
|
||||||
agentId: "research-agent",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findOne", () => {
|
|
||||||
it("should return a finding", async () => {
|
|
||||||
const finding = {
|
|
||||||
id: mockFindingId,
|
|
||||||
workspaceId: mockWorkspaceId,
|
|
||||||
taskId: null,
|
|
||||||
agentId: "research-agent",
|
|
||||||
type: "security",
|
|
||||||
title: "SQL injection risk",
|
|
||||||
data: { severity: "high" },
|
|
||||||
summary: "Potential SQL injection in search endpoint.",
|
|
||||||
createdAt: new Date(),
|
|
||||||
updatedAt: new Date(),
|
|
||||||
};
|
|
||||||
|
|
||||||
mockPrismaService.finding.findUnique.mockResolvedValue(finding);
|
|
||||||
|
|
||||||
const result = await service.findOne(mockFindingId, mockWorkspaceId);
|
|
||||||
|
|
||||||
expect(result).toEqual(finding);
|
|
||||||
expect(prisma.finding.findUnique).toHaveBeenCalledWith({
|
|
||||||
where: {
|
|
||||||
id: mockFindingId,
|
|
||||||
workspaceId: mockWorkspaceId,
|
|
||||||
},
|
|
||||||
select: expect.any(Object),
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw when finding does not exist", async () => {
|
|
||||||
mockPrismaService.finding.findUnique.mockResolvedValue(null);
|
|
||||||
|
|
||||||
await expect(service.findOne(mockFindingId, mockWorkspaceId)).rejects.toThrow(
|
|
||||||
NotFoundException
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("search", () => {
|
|
||||||
it("should throw BadRequestException when embeddings are not configured", async () => {
|
|
||||||
mockEmbeddingService.isConfigured.mockReturnValue(false);
|
|
||||||
|
|
||||||
await expect(
|
|
||||||
service.search(mockWorkspaceId, {
|
|
||||||
query: "sql injection",
|
|
||||||
})
|
|
||||||
).rejects.toThrow(BadRequestException);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should return similarity-ranked search results", async () => {
|
|
||||||
mockEmbeddingService.isConfigured.mockReturnValue(true);
|
|
||||||
mockEmbeddingService.generateEmbedding.mockResolvedValue([0.1, 0.2, 0.3]);
|
|
||||||
mockPrismaService.$queryRaw
|
|
||||||
.mockResolvedValueOnce([
|
|
||||||
{
|
|
||||||
id: mockFindingId,
|
|
||||||
workspace_id: mockWorkspaceId,
|
|
||||||
task_id: null,
|
|
||||||
agent_id: "research-agent",
|
|
||||||
type: "security",
|
|
||||||
title: "SQL injection risk",
|
|
||||||
data: { severity: "high" },
|
|
||||||
summary: "Potential SQL injection in search endpoint.",
|
|
||||||
created_at: new Date(),
|
|
||||||
updated_at: new Date(),
|
|
||||||
score: 0.91,
|
|
||||||
},
|
|
||||||
])
|
|
||||||
.mockResolvedValueOnce([{ count: BigInt(1) }]);
|
|
||||||
|
|
||||||
const result = await service.search(mockWorkspaceId, {
|
|
||||||
query: "sql injection",
|
|
||||||
page: 1,
|
|
||||||
limit: 5,
|
|
||||||
similarityThreshold: 0.5,
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(result.query).toBe("sql injection");
|
|
||||||
expect(result.data).toHaveLength(1);
|
|
||||||
expect(result.data[0].score).toBe(0.91);
|
|
||||||
expect(result.meta.total).toBe(1);
|
|
||||||
expect(prisma.$queryRaw).toHaveBeenCalledTimes(2);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("remove", () => {
|
|
||||||
it("should delete a finding", async () => {
|
|
||||||
mockPrismaService.finding.findUnique.mockResolvedValue({
|
|
||||||
id: mockFindingId,
|
|
||||||
workspaceId: mockWorkspaceId,
|
|
||||||
});
|
|
||||||
mockPrismaService.finding.delete.mockResolvedValue({
|
|
||||||
id: mockFindingId,
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await service.remove(mockFindingId, mockWorkspaceId);
|
|
||||||
|
|
||||||
expect(result).toEqual({ message: "Finding deleted successfully" });
|
|
||||||
expect(prisma.finding.delete).toHaveBeenCalledWith({
|
|
||||||
where: {
|
|
||||||
id: mockFindingId,
|
|
||||||
workspaceId: mockWorkspaceId,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should throw when finding does not exist", async () => {
|
|
||||||
mockPrismaService.finding.findUnique.mockResolvedValue(null);
|
|
||||||
|
|
||||||
await expect(service.remove(mockFindingId, mockWorkspaceId)).rejects.toThrow(
|
|
||||||
NotFoundException
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,337 +0,0 @@
|
|||||||
import { BadRequestException, Injectable, Logger, NotFoundException } from "@nestjs/common";
|
|
||||||
import { Prisma } from "@prisma/client";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import { EmbeddingService } from "../knowledge/services/embedding.service";
|
|
||||||
import type { CreateFindingDto, QueryFindingsDto, SearchFindingsDto } from "./dto";
|
|
||||||
|
|
||||||
const findingSelect = {
|
|
||||||
id: true,
|
|
||||||
workspaceId: true,
|
|
||||||
taskId: true,
|
|
||||||
agentId: true,
|
|
||||||
type: true,
|
|
||||||
title: true,
|
|
||||||
data: true,
|
|
||||||
summary: true,
|
|
||||||
createdAt: true,
|
|
||||||
updatedAt: true,
|
|
||||||
} satisfies Prisma.FindingSelect;
|
|
||||||
|
|
||||||
type FindingRecord = Prisma.FindingGetPayload<{ select: typeof findingSelect }>;
|
|
||||||
|
|
||||||
interface RawFindingSearchResult {
|
|
||||||
id: string;
|
|
||||||
workspace_id: string;
|
|
||||||
task_id: string | null;
|
|
||||||
agent_id: string;
|
|
||||||
type: string;
|
|
||||||
title: string;
|
|
||||||
data: Prisma.JsonValue;
|
|
||||||
summary: string;
|
|
||||||
created_at: Date;
|
|
||||||
updated_at: Date;
|
|
||||||
score: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface FindingSearchResult extends FindingRecord {
|
|
||||||
score: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface PaginatedMeta {
|
|
||||||
total: number;
|
|
||||||
page: number;
|
|
||||||
limit: number;
|
|
||||||
totalPages: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface PaginatedFindingsResponse {
|
|
||||||
data: FindingRecord[];
|
|
||||||
meta: PaginatedMeta;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface FindingsSearchResponse {
|
|
||||||
data: FindingSearchResult[];
|
|
||||||
meta: PaginatedMeta;
|
|
||||||
query: string;
|
|
||||||
similarityThreshold: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Service for managing structured findings with vector search support
|
|
||||||
*/
|
|
||||||
@Injectable()
|
|
||||||
export class FindingsService {
|
|
||||||
private readonly logger = new Logger(FindingsService.name);
|
|
||||||
private readonly defaultSimilarityThreshold: number;
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private readonly prisma: PrismaService,
|
|
||||||
private readonly embeddingService: EmbeddingService
|
|
||||||
) {
|
|
||||||
const parsedThreshold = Number.parseFloat(process.env.FINDINGS_SIMILARITY_THRESHOLD ?? "0.5");
|
|
||||||
|
|
||||||
this.defaultSimilarityThreshold =
|
|
||||||
Number.isFinite(parsedThreshold) && parsedThreshold >= 0 && parsedThreshold <= 1
|
|
||||||
? parsedThreshold
|
|
||||||
: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a finding and generate its embedding from the summary when available
|
|
||||||
*/
|
|
||||||
async create(workspaceId: string, createFindingDto: CreateFindingDto): Promise<FindingRecord> {
|
|
||||||
if (createFindingDto.taskId) {
|
|
||||||
const task = await this.prisma.agentTask.findUnique({
|
|
||||||
where: {
|
|
||||||
id: createFindingDto.taskId,
|
|
||||||
workspaceId,
|
|
||||||
},
|
|
||||||
select: { id: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!task) {
|
|
||||||
throw new NotFoundException(`Agent task with ID ${createFindingDto.taskId} not found`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const createInput: Prisma.FindingUncheckedCreateInput = {
|
|
||||||
workspaceId,
|
|
||||||
agentId: createFindingDto.agentId,
|
|
||||||
type: createFindingDto.type,
|
|
||||||
title: createFindingDto.title,
|
|
||||||
data: createFindingDto.data as Prisma.InputJsonValue,
|
|
||||||
summary: createFindingDto.summary,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (createFindingDto.taskId) {
|
|
||||||
createInput.taskId = createFindingDto.taskId;
|
|
||||||
}
|
|
||||||
|
|
||||||
const finding = await this.prisma.finding.create({
|
|
||||||
data: createInput,
|
|
||||||
select: findingSelect,
|
|
||||||
});
|
|
||||||
|
|
||||||
await this.generateAndStoreEmbedding(finding.id, workspaceId, finding.summary);
|
|
||||||
|
|
||||||
if (this.embeddingService.isConfigured()) {
|
|
||||||
return this.findOne(finding.id, workspaceId);
|
|
||||||
}
|
|
||||||
|
|
||||||
return finding;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get paginated findings with optional filters
|
|
||||||
*/
|
|
||||||
async findAll(workspaceId: string, query: QueryFindingsDto): Promise<PaginatedFindingsResponse> {
|
|
||||||
const page = query.page ?? 1;
|
|
||||||
const limit = query.limit ?? 50;
|
|
||||||
const skip = (page - 1) * limit;
|
|
||||||
|
|
||||||
const where: Prisma.FindingWhereInput = {
|
|
||||||
workspaceId,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (query.agentId) {
|
|
||||||
where.agentId = query.agentId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (query.type) {
|
|
||||||
where.type = query.type;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (query.taskId) {
|
|
||||||
where.taskId = query.taskId;
|
|
||||||
}
|
|
||||||
|
|
||||||
const [data, total] = await Promise.all([
|
|
||||||
this.prisma.finding.findMany({
|
|
||||||
where,
|
|
||||||
select: findingSelect,
|
|
||||||
orderBy: {
|
|
||||||
createdAt: "desc",
|
|
||||||
},
|
|
||||||
skip,
|
|
||||||
take: limit,
|
|
||||||
}),
|
|
||||||
this.prisma.finding.count({ where }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
return {
|
|
||||||
data,
|
|
||||||
meta: {
|
|
||||||
total,
|
|
||||||
page,
|
|
||||||
limit,
|
|
||||||
totalPages: Math.ceil(total / limit),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a single finding by ID
|
|
||||||
*/
|
|
||||||
async findOne(id: string, workspaceId: string): Promise<FindingRecord> {
|
|
||||||
const finding = await this.prisma.finding.findUnique({
|
|
||||||
where: {
|
|
||||||
id,
|
|
||||||
workspaceId,
|
|
||||||
},
|
|
||||||
select: findingSelect,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!finding) {
|
|
||||||
throw new NotFoundException(`Finding with ID ${id} not found`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return finding;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Semantic search findings using vector similarity
|
|
||||||
*/
|
|
||||||
async search(workspaceId: string, searchDto: SearchFindingsDto): Promise<FindingsSearchResponse> {
|
|
||||||
if (!this.embeddingService.isConfigured()) {
|
|
||||||
throw new BadRequestException(
|
|
||||||
"Finding vector search requires OPENAI_API_KEY to be configured"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const page = searchDto.page ?? 1;
|
|
||||||
const limit = searchDto.limit ?? 20;
|
|
||||||
const offset = (page - 1) * limit;
|
|
||||||
const similarityThreshold = searchDto.similarityThreshold ?? this.defaultSimilarityThreshold;
|
|
||||||
const distanceThreshold = 1 - similarityThreshold;
|
|
||||||
|
|
||||||
const queryEmbedding = await this.embeddingService.generateEmbedding(searchDto.query);
|
|
||||||
const embeddingString = `[${queryEmbedding.join(",")}]`;
|
|
||||||
|
|
||||||
const agentFilter = searchDto.agentId
|
|
||||||
? Prisma.sql`AND f.agent_id = ${searchDto.agentId}`
|
|
||||||
: Prisma.sql``;
|
|
||||||
const typeFilter = searchDto.type ? Prisma.sql`AND f.type = ${searchDto.type}` : Prisma.sql``;
|
|
||||||
const taskFilter = searchDto.taskId
|
|
||||||
? Prisma.sql`AND f.task_id = ${searchDto.taskId}::uuid`
|
|
||||||
: Prisma.sql``;
|
|
||||||
|
|
||||||
const searchResults = await this.prisma.$queryRaw<RawFindingSearchResult[]>`
|
|
||||||
SELECT
|
|
||||||
f.id,
|
|
||||||
f.workspace_id,
|
|
||||||
f.task_id,
|
|
||||||
f.agent_id,
|
|
||||||
f.type,
|
|
||||||
f.title,
|
|
||||||
f.data,
|
|
||||||
f.summary,
|
|
||||||
f.created_at,
|
|
||||||
f.updated_at,
|
|
||||||
(1 - (f.embedding <=> ${embeddingString}::vector)) AS score
|
|
||||||
FROM findings f
|
|
||||||
WHERE f.workspace_id = ${workspaceId}::uuid
|
|
||||||
AND f.embedding IS NOT NULL
|
|
||||||
${agentFilter}
|
|
||||||
${typeFilter}
|
|
||||||
${taskFilter}
|
|
||||||
AND (f.embedding <=> ${embeddingString}::vector) <= ${distanceThreshold}
|
|
||||||
ORDER BY f.embedding <=> ${embeddingString}::vector
|
|
||||||
LIMIT ${limit}
|
|
||||||
OFFSET ${offset}
|
|
||||||
`;
|
|
||||||
|
|
||||||
const countResult = await this.prisma.$queryRaw<[{ count: bigint }]>`
|
|
||||||
SELECT COUNT(*) as count
|
|
||||||
FROM findings f
|
|
||||||
WHERE f.workspace_id = ${workspaceId}::uuid
|
|
||||||
AND f.embedding IS NOT NULL
|
|
||||||
${agentFilter}
|
|
||||||
${typeFilter}
|
|
||||||
${taskFilter}
|
|
||||||
AND (f.embedding <=> ${embeddingString}::vector) <= ${distanceThreshold}
|
|
||||||
`;
|
|
||||||
|
|
||||||
const total = Number(countResult[0].count);
|
|
||||||
|
|
||||||
const data: FindingSearchResult[] = searchResults.map((row) => ({
|
|
||||||
id: row.id,
|
|
||||||
workspaceId: row.workspace_id,
|
|
||||||
taskId: row.task_id,
|
|
||||||
agentId: row.agent_id,
|
|
||||||
type: row.type,
|
|
||||||
title: row.title,
|
|
||||||
data: row.data,
|
|
||||||
summary: row.summary,
|
|
||||||
createdAt: row.created_at,
|
|
||||||
updatedAt: row.updated_at,
|
|
||||||
score: row.score,
|
|
||||||
}));
|
|
||||||
|
|
||||||
return {
|
|
||||||
data,
|
|
||||||
meta: {
|
|
||||||
total,
|
|
||||||
page,
|
|
||||||
limit,
|
|
||||||
totalPages: Math.ceil(total / limit),
|
|
||||||
},
|
|
||||||
query: searchDto.query,
|
|
||||||
similarityThreshold,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Delete a finding
|
|
||||||
*/
|
|
||||||
async remove(id: string, workspaceId: string): Promise<{ message: string }> {
|
|
||||||
const existingFinding = await this.prisma.finding.findUnique({
|
|
||||||
where: {
|
|
||||||
id,
|
|
||||||
workspaceId,
|
|
||||||
},
|
|
||||||
select: { id: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!existingFinding) {
|
|
||||||
throw new NotFoundException(`Finding with ID ${id} not found`);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.prisma.finding.delete({
|
|
||||||
where: {
|
|
||||||
id,
|
|
||||||
workspaceId,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return { message: "Finding deleted successfully" };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate and persist embedding for a finding summary
|
|
||||||
*/
|
|
||||||
private async generateAndStoreEmbedding(
|
|
||||||
findingId: string,
|
|
||||||
workspaceId: string,
|
|
||||||
summary: string
|
|
||||||
): Promise<void> {
|
|
||||||
if (!this.embeddingService.isConfigured()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const embedding = await this.embeddingService.generateEmbedding(summary);
|
|
||||||
const embeddingString = `[${embedding.join(",")}]`;
|
|
||||||
|
|
||||||
await this.prisma.$executeRaw`
|
|
||||||
UPDATE findings
|
|
||||||
SET embedding = ${embeddingString}::vector,
|
|
||||||
updated_at = NOW()
|
|
||||||
WHERE id = ${findingId}::uuid
|
|
||||||
AND workspace_id = ${workspaceId}::uuid
|
|
||||||
`;
|
|
||||||
} catch (error) {
|
|
||||||
const message = error instanceof Error ? error.message : String(error);
|
|
||||||
this.logger.warn(`Failed to generate embedding for finding ${findingId}: ${message}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
import { IsNumber, IsOptional, IsString, MaxLength, MinLength } from "class-validator";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DTO for a single jarvis-brain project record.
|
|
||||||
* This matches the project object shape consumed by scripts/migrate-brain.ts.
|
|
||||||
*/
|
|
||||||
export class ImportProjectDto {
|
|
||||||
@IsString({ message: "id must be a string" })
|
|
||||||
@MinLength(1, { message: "id must not be empty" })
|
|
||||||
@MaxLength(255, { message: "id must not exceed 255 characters" })
|
|
||||||
id!: string;
|
|
||||||
|
|
||||||
@IsString({ message: "name must be a string" })
|
|
||||||
@MinLength(1, { message: "name must not be empty" })
|
|
||||||
@MaxLength(255, { message: "name must not exceed 255 characters" })
|
|
||||||
name!: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "description must be a string" })
|
|
||||||
description?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "domain must be a string" })
|
|
||||||
domain?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "status must be a string" })
|
|
||||||
status?: string | null;
|
|
||||||
|
|
||||||
// jarvis-brain project priority can be a number, string, or null
|
|
||||||
@IsOptional()
|
|
||||||
priority?: number | string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsNumber({}, { message: "progress must be a number" })
|
|
||||||
progress?: number | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "repo must be a string" })
|
|
||||||
repo?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "branch must be a string" })
|
|
||||||
branch?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "current_milestone must be a string" })
|
|
||||||
current_milestone?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "next_milestone must be a string" })
|
|
||||||
next_milestone?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "blocker must be a string" })
|
|
||||||
blocker?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "owner must be a string" })
|
|
||||||
owner?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "docs_path must be a string" })
|
|
||||||
docs_path?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "created must be a string" })
|
|
||||||
created?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "updated must be a string" })
|
|
||||||
updated?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "target_date must be a string" })
|
|
||||||
target_date?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "notes must be a string" })
|
|
||||||
notes?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "notes_nontechnical must be a string" })
|
|
||||||
notes_nontechnical?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "parent must be a string" })
|
|
||||||
parent?: string | null;
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
export interface ImportResponseDto {
|
|
||||||
imported: number;
|
|
||||||
skipped: number;
|
|
||||||
errors: string[];
|
|
||||||
}
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
import { IsArray, IsNumber, IsOptional, IsString, MaxLength, MinLength } from "class-validator";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DTO for a single jarvis-brain task record.
|
|
||||||
* This matches the task object shape consumed by scripts/migrate-brain.ts.
|
|
||||||
*/
|
|
||||||
export class ImportTaskDto {
|
|
||||||
@IsString({ message: "id must be a string" })
|
|
||||||
@MinLength(1, { message: "id must not be empty" })
|
|
||||||
@MaxLength(255, { message: "id must not exceed 255 characters" })
|
|
||||||
id!: string;
|
|
||||||
|
|
||||||
@IsString({ message: "title must be a string" })
|
|
||||||
@MinLength(1, { message: "title must not be empty" })
|
|
||||||
@MaxLength(255, { message: "title must not exceed 255 characters" })
|
|
||||||
title!: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "domain must be a string" })
|
|
||||||
domain?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "project must be a string" })
|
|
||||||
project?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsArray({ message: "related must be an array" })
|
|
||||||
@IsString({ each: true, message: "related items must be strings" })
|
|
||||||
related?: string[];
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "priority must be a string" })
|
|
||||||
priority?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "status must be a string" })
|
|
||||||
status?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsNumber({}, { message: "progress must be a number" })
|
|
||||||
progress?: number | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "due must be a string" })
|
|
||||||
due?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsArray({ message: "blocks must be an array" })
|
|
||||||
@IsString({ each: true, message: "blocks items must be strings" })
|
|
||||||
blocks?: string[];
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsArray({ message: "blocked_by must be an array" })
|
|
||||||
@IsString({ each: true, message: "blocked_by items must be strings" })
|
|
||||||
blocked_by?: string[];
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "assignee must be a string" })
|
|
||||||
assignee?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "created must be a string" })
|
|
||||||
created?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "updated must be a string" })
|
|
||||||
updated?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "notes must be a string" })
|
|
||||||
notes?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "notes_nontechnical must be a string" })
|
|
||||||
notes_nontechnical?: string | null;
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export { ImportTaskDto } from "./import-task.dto";
|
|
||||||
export { ImportProjectDto } from "./import-project.dto";
|
|
||||||
export type { ImportResponseDto } from "./import-response.dto";
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import { Body, Controller, ParseArrayPipe, Post, UseGuards } from "@nestjs/common";
|
|
||||||
import type { AuthUser } from "@mosaic/shared";
|
|
||||||
import { CurrentUser } from "../auth/decorators/current-user.decorator";
|
|
||||||
import { AdminGuard } from "../auth/guards/admin.guard";
|
|
||||||
import { AuthGuard } from "../auth/guards/auth.guard";
|
|
||||||
import { Workspace } from "../common/decorators";
|
|
||||||
import { WorkspaceGuard } from "../common/guards";
|
|
||||||
import { ImportProjectDto, type ImportResponseDto, ImportTaskDto } from "./dto";
|
|
||||||
import { ImportService } from "./import.service";
|
|
||||||
|
|
||||||
@Controller("import")
|
|
||||||
@UseGuards(AuthGuard, WorkspaceGuard, AdminGuard)
|
|
||||||
export class ImportController {
|
|
||||||
constructor(private readonly importService: ImportService) {}
|
|
||||||
|
|
||||||
@Post("tasks")
|
|
||||||
async importTasks(
|
|
||||||
@Body(new ParseArrayPipe({ items: ImportTaskDto })) taskPayload: ImportTaskDto[],
|
|
||||||
@Workspace() workspaceId: string,
|
|
||||||
@CurrentUser() user: AuthUser
|
|
||||||
): Promise<ImportResponseDto> {
|
|
||||||
return this.importService.importTasks(workspaceId, user.id, taskPayload);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post("projects")
|
|
||||||
async importProjects(
|
|
||||||
@Body(new ParseArrayPipe({ items: ImportProjectDto })) projectPayload: ImportProjectDto[],
|
|
||||||
@Workspace() workspaceId: string,
|
|
||||||
@CurrentUser() user: AuthUser
|
|
||||||
): Promise<ImportResponseDto> {
|
|
||||||
return this.importService.importProjects(workspaceId, user.id, projectPayload);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import { Module } from "@nestjs/common";
|
|
||||||
import { AuthModule } from "../auth/auth.module";
|
|
||||||
import { PrismaModule } from "../prisma/prisma.module";
|
|
||||||
import { ImportController } from "./import.controller";
|
|
||||||
import { ImportService } from "./import.service";
|
|
||||||
|
|
||||||
@Module({
|
|
||||||
imports: [PrismaModule, AuthModule],
|
|
||||||
controllers: [ImportController],
|
|
||||||
providers: [ImportService],
|
|
||||||
exports: [ImportService],
|
|
||||||
})
|
|
||||||
export class ImportModule {}
|
|
||||||
@@ -1,251 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
||||||
import { Test, TestingModule } from "@nestjs/testing";
|
|
||||||
import { ProjectStatus, TaskPriority, TaskStatus } from "@prisma/client";
|
|
||||||
import { ImportService } from "./import.service";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
|
|
||||||
describe("ImportService", () => {
|
|
||||||
let service: ImportService;
|
|
||||||
|
|
||||||
const mockPrismaService = {
|
|
||||||
withWorkspaceContext: vi.fn(),
|
|
||||||
domain: {
|
|
||||||
findUnique: vi.fn(),
|
|
||||||
create: vi.fn(),
|
|
||||||
},
|
|
||||||
project: {
|
|
||||||
findFirst: vi.fn(),
|
|
||||||
create: vi.fn(),
|
|
||||||
},
|
|
||||||
task: {
|
|
||||||
findFirst: vi.fn(),
|
|
||||||
create: vi.fn(),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const workspaceId = "550e8400-e29b-41d4-a716-446655440001";
|
|
||||||
const userId = "550e8400-e29b-41d4-a716-446655440002";
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
|
||||||
providers: [
|
|
||||||
ImportService,
|
|
||||||
{
|
|
||||||
provide: PrismaService,
|
|
||||||
useValue: mockPrismaService,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}).compile();
|
|
||||||
|
|
||||||
service = module.get<ImportService>(ImportService);
|
|
||||||
vi.clearAllMocks();
|
|
||||||
|
|
||||||
mockPrismaService.withWorkspaceContext.mockImplementation(
|
|
||||||
async (_userId: string, _workspaceId: string, fn: (client: unknown) => Promise<unknown>) => {
|
|
||||||
return fn(mockPrismaService);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should be defined", () => {
|
|
||||||
expect(service).toBeDefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("importTasks", () => {
|
|
||||||
it("maps status/priority/domain and imports a task", async () => {
|
|
||||||
mockPrismaService.task.findFirst.mockResolvedValue(null);
|
|
||||||
mockPrismaService.domain.findUnique.mockResolvedValue(null);
|
|
||||||
mockPrismaService.domain.create.mockResolvedValue({ id: "domain-id" });
|
|
||||||
mockPrismaService.project.findFirst.mockResolvedValue(null);
|
|
||||||
mockPrismaService.task.create.mockResolvedValue({ id: "task-id" });
|
|
||||||
|
|
||||||
const result = await service.importTasks(workspaceId, userId, [
|
|
||||||
{
|
|
||||||
id: "task-1",
|
|
||||||
title: "Import me",
|
|
||||||
domain: "Platform Ops",
|
|
||||||
status: "in-progress",
|
|
||||||
priority: "critical",
|
|
||||||
project: null,
|
|
||||||
related: [],
|
|
||||||
blocks: [],
|
|
||||||
blocked_by: [],
|
|
||||||
progress: 42,
|
|
||||||
due: "2026-03-15",
|
|
||||||
created: "2026-03-01T10:00:00.000Z",
|
|
||||||
updated: "2026-03-05T12:00:00.000Z",
|
|
||||||
assignee: null,
|
|
||||||
notes: "notes",
|
|
||||||
notes_nontechnical: "non technical",
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
expect(result).toEqual({ imported: 1, skipped: 0, errors: [] });
|
|
||||||
expect(mockPrismaService.task.create).toHaveBeenCalledWith(
|
|
||||||
expect.objectContaining({
|
|
||||||
data: expect.objectContaining({
|
|
||||||
title: "Import me",
|
|
||||||
status: TaskStatus.IN_PROGRESS,
|
|
||||||
priority: TaskPriority.HIGH,
|
|
||||||
domainId: "domain-id",
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("skips existing task by brainId", async () => {
|
|
||||||
mockPrismaService.task.findFirst.mockResolvedValue({ id: "existing-task-id" });
|
|
||||||
|
|
||||||
const result = await service.importTasks(workspaceId, userId, [
|
|
||||||
{
|
|
||||||
id: "task-1",
|
|
||||||
title: "Existing",
|
|
||||||
domain: null,
|
|
||||||
status: "pending",
|
|
||||||
priority: "medium",
|
|
||||||
project: null,
|
|
||||||
related: [],
|
|
||||||
blocks: [],
|
|
||||||
blocked_by: [],
|
|
||||||
progress: null,
|
|
||||||
due: null,
|
|
||||||
created: null,
|
|
||||||
updated: null,
|
|
||||||
assignee: null,
|
|
||||||
notes: null,
|
|
||||||
notes_nontechnical: null,
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
expect(result.imported).toBe(0);
|
|
||||||
expect(result.skipped).toBe(1);
|
|
||||||
expect(mockPrismaService.task.create).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("collects mapping/missing-project errors while importing", async () => {
|
|
||||||
mockPrismaService.task.findFirst.mockResolvedValue(null);
|
|
||||||
mockPrismaService.project.findFirst.mockResolvedValue(null);
|
|
||||||
mockPrismaService.task.create.mockResolvedValue({ id: "task-id" });
|
|
||||||
|
|
||||||
const result = await service.importTasks(workspaceId, userId, [
|
|
||||||
{
|
|
||||||
id: "task-1",
|
|
||||||
title: "Needs project",
|
|
||||||
domain: null,
|
|
||||||
status: "mystery-status",
|
|
||||||
priority: "mystery-priority",
|
|
||||||
project: "brain-project-1",
|
|
||||||
related: [],
|
|
||||||
blocks: [],
|
|
||||||
blocked_by: [],
|
|
||||||
progress: null,
|
|
||||||
due: null,
|
|
||||||
created: null,
|
|
||||||
updated: null,
|
|
||||||
assignee: null,
|
|
||||||
notes: null,
|
|
||||||
notes_nontechnical: null,
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
expect(result.imported).toBe(1);
|
|
||||||
expect(result.errors).toEqual(
|
|
||||||
expect.arrayContaining([
|
|
||||||
expect.stringContaining('Unknown task status "mystery-status"'),
|
|
||||||
expect.stringContaining('Unknown task priority "mystery-priority"'),
|
|
||||||
expect.stringContaining('referenced project "brain-project-1" not found'),
|
|
||||||
])
|
|
||||||
);
|
|
||||||
expect(mockPrismaService.task.create).toHaveBeenCalledWith(
|
|
||||||
expect.objectContaining({
|
|
||||||
data: expect.objectContaining({
|
|
||||||
status: TaskStatus.NOT_STARTED,
|
|
||||||
priority: TaskPriority.MEDIUM,
|
|
||||||
projectId: null,
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("importProjects", () => {
|
|
||||||
it("maps status/domain and imports a project", async () => {
|
|
||||||
mockPrismaService.project.findFirst.mockResolvedValue(null);
|
|
||||||
mockPrismaService.domain.findUnique.mockResolvedValue(null);
|
|
||||||
mockPrismaService.domain.create.mockResolvedValue({ id: "domain-id" });
|
|
||||||
mockPrismaService.project.create.mockResolvedValue({ id: "project-id" });
|
|
||||||
|
|
||||||
const result = await service.importProjects(workspaceId, userId, [
|
|
||||||
{
|
|
||||||
id: "project-1",
|
|
||||||
name: "Project One",
|
|
||||||
description: "desc",
|
|
||||||
domain: "Backend",
|
|
||||||
status: "in-progress",
|
|
||||||
priority: "high",
|
|
||||||
progress: 50,
|
|
||||||
repo: "git@example.com/repo",
|
|
||||||
branch: "main",
|
|
||||||
current_milestone: "MS21",
|
|
||||||
next_milestone: "MS22",
|
|
||||||
blocker: null,
|
|
||||||
owner: "owner",
|
|
||||||
docs_path: "docs/PRD.md",
|
|
||||||
created: "2026-03-01",
|
|
||||||
updated: "2026-03-05",
|
|
||||||
target_date: "2026-04-01",
|
|
||||||
notes: "notes",
|
|
||||||
notes_nontechnical: "non tech",
|
|
||||||
parent: null,
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
expect(result).toEqual({ imported: 1, skipped: 0, errors: [] });
|
|
||||||
expect(mockPrismaService.project.create).toHaveBeenCalledWith(
|
|
||||||
expect.objectContaining({
|
|
||||||
data: expect.objectContaining({
|
|
||||||
name: "Project One",
|
|
||||||
status: ProjectStatus.ACTIVE,
|
|
||||||
domainId: "domain-id",
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("captures create failures as errors", async () => {
|
|
||||||
mockPrismaService.project.findFirst.mockResolvedValue(null);
|
|
||||||
mockPrismaService.project.create.mockRejectedValue(new Error("db failed"));
|
|
||||||
|
|
||||||
const result = await service.importProjects(workspaceId, userId, [
|
|
||||||
{
|
|
||||||
id: "project-1",
|
|
||||||
name: "Project One",
|
|
||||||
description: null,
|
|
||||||
domain: null,
|
|
||||||
status: "planning",
|
|
||||||
priority: null,
|
|
||||||
progress: null,
|
|
||||||
repo: null,
|
|
||||||
branch: null,
|
|
||||||
current_milestone: null,
|
|
||||||
next_milestone: null,
|
|
||||||
blocker: null,
|
|
||||||
owner: null,
|
|
||||||
docs_path: null,
|
|
||||||
created: null,
|
|
||||||
updated: null,
|
|
||||||
target_date: null,
|
|
||||||
notes: null,
|
|
||||||
notes_nontechnical: null,
|
|
||||||
parent: null,
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
expect(result.imported).toBe(0);
|
|
||||||
expect(result.skipped).toBe(1);
|
|
||||||
expect(result.errors).toEqual([
|
|
||||||
expect.stringContaining("project project-1: failed to import: db failed"),
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,496 +0,0 @@
|
|||||||
import { Injectable } from "@nestjs/common";
|
|
||||||
import { Prisma, PrismaClient, ProjectStatus, TaskPriority, TaskStatus } from "@prisma/client";
|
|
||||||
import { PrismaService } from "../prisma/prisma.service";
|
|
||||||
import type { ImportProjectDto, ImportResponseDto, ImportTaskDto } from "./dto";
|
|
||||||
|
|
||||||
interface TaskStatusMapping {
|
|
||||||
status: TaskStatus;
|
|
||||||
issue: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface TaskPriorityMapping {
|
|
||||||
priority: TaskPriority;
|
|
||||||
issue: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ProjectStatusMapping {
|
|
||||||
status: ProjectStatus;
|
|
||||||
issue: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class ImportService {
|
|
||||||
constructor(private readonly prisma: PrismaService) {}
|
|
||||||
|
|
||||||
async importTasks(
|
|
||||||
workspaceId: string,
|
|
||||||
userId: string,
|
|
||||||
taskPayload: ImportTaskDto[]
|
|
||||||
): Promise<ImportResponseDto> {
|
|
||||||
const errors: string[] = [];
|
|
||||||
let imported = 0;
|
|
||||||
let skipped = 0;
|
|
||||||
|
|
||||||
const importTimestamp = new Date().toISOString();
|
|
||||||
const seenBrainTaskIds = new Set<string>();
|
|
||||||
const domainIdBySlug = new Map<string, string>();
|
|
||||||
const projectIdByBrainId = new Map<string, string | null>();
|
|
||||||
|
|
||||||
await this.prisma.withWorkspaceContext(userId, workspaceId, async (tx: PrismaClient) => {
|
|
||||||
for (const [index, task] of taskPayload.entries()) {
|
|
||||||
const brainId = task.id.trim();
|
|
||||||
|
|
||||||
if (seenBrainTaskIds.has(brainId)) {
|
|
||||||
skipped += 1;
|
|
||||||
errors.push(`task ${brainId}: duplicate item in request body`);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
seenBrainTaskIds.add(brainId);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const existingTask = await tx.task.findFirst({
|
|
||||||
where: {
|
|
||||||
workspaceId,
|
|
||||||
metadata: {
|
|
||||||
path: ["brainId"],
|
|
||||||
equals: brainId,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
select: { id: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (existingTask) {
|
|
||||||
skipped += 1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const mappedStatus = this.mapTaskStatus(task.status ?? null);
|
|
||||||
if (mappedStatus.issue) {
|
|
||||||
errors.push(`task ${brainId}: ${mappedStatus.issue}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const mappedPriority = this.mapTaskPriority(task.priority ?? null);
|
|
||||||
if (mappedPriority.issue) {
|
|
||||||
errors.push(`task ${brainId}: ${mappedPriority.issue}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const projectBrainId = task.project?.trim() ? task.project.trim() : null;
|
|
||||||
const projectId = await this.resolveProjectId(
|
|
||||||
tx,
|
|
||||||
workspaceId,
|
|
||||||
projectBrainId,
|
|
||||||
projectIdByBrainId,
|
|
||||||
brainId,
|
|
||||||
errors
|
|
||||||
);
|
|
||||||
|
|
||||||
const domainId = await this.resolveDomainId(
|
|
||||||
tx,
|
|
||||||
workspaceId,
|
|
||||||
task.domain ?? null,
|
|
||||||
importTimestamp,
|
|
||||||
domainIdBySlug
|
|
||||||
);
|
|
||||||
|
|
||||||
const createdAt =
|
|
||||||
this.normalizeDate(task.created ?? null, `task ${brainId}.created`, errors) ??
|
|
||||||
new Date();
|
|
||||||
const updatedAt =
|
|
||||||
this.normalizeDate(task.updated ?? null, `task ${brainId}.updated`, errors) ??
|
|
||||||
createdAt;
|
|
||||||
const dueDate = this.normalizeDate(task.due ?? null, `task ${brainId}.due`, errors);
|
|
||||||
const completedAt = mappedStatus.status === TaskStatus.COMPLETED ? updatedAt : null;
|
|
||||||
|
|
||||||
const metadata = this.asJsonValue({
|
|
||||||
source: "jarvis-brain",
|
|
||||||
brainId,
|
|
||||||
brainDomain: task.domain ?? null,
|
|
||||||
brainProjectId: projectBrainId,
|
|
||||||
rawStatus: task.status ?? null,
|
|
||||||
rawPriority: task.priority ?? null,
|
|
||||||
related: task.related ?? [],
|
|
||||||
blocks: task.blocks ?? [],
|
|
||||||
blockedBy: task.blocked_by ?? [],
|
|
||||||
assignee: task.assignee ?? null,
|
|
||||||
progress: task.progress ?? null,
|
|
||||||
notes: task.notes ?? null,
|
|
||||||
notesNonTechnical: task.notes_nontechnical ?? null,
|
|
||||||
importedAt: importTimestamp,
|
|
||||||
});
|
|
||||||
|
|
||||||
await tx.task.create({
|
|
||||||
data: {
|
|
||||||
workspaceId,
|
|
||||||
title: task.title,
|
|
||||||
description: task.notes ?? null,
|
|
||||||
status: mappedStatus.status,
|
|
||||||
priority: mappedPriority.priority,
|
|
||||||
dueDate,
|
|
||||||
creatorId: userId,
|
|
||||||
projectId,
|
|
||||||
domainId,
|
|
||||||
metadata,
|
|
||||||
createdAt,
|
|
||||||
updatedAt,
|
|
||||||
completedAt,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
imported += 1;
|
|
||||||
} catch (error) {
|
|
||||||
skipped += 1;
|
|
||||||
errors.push(
|
|
||||||
`task ${brainId || `index-${String(index)}`}: failed to import: ${this.getErrorMessage(error)}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
imported,
|
|
||||||
skipped,
|
|
||||||
errors,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async importProjects(
|
|
||||||
workspaceId: string,
|
|
||||||
userId: string,
|
|
||||||
projectPayload: ImportProjectDto[]
|
|
||||||
): Promise<ImportResponseDto> {
|
|
||||||
const errors: string[] = [];
|
|
||||||
let imported = 0;
|
|
||||||
let skipped = 0;
|
|
||||||
|
|
||||||
const importTimestamp = new Date().toISOString();
|
|
||||||
const seenBrainProjectIds = new Set<string>();
|
|
||||||
const domainIdBySlug = new Map<string, string>();
|
|
||||||
|
|
||||||
await this.prisma.withWorkspaceContext(userId, workspaceId, async (tx: PrismaClient) => {
|
|
||||||
for (const [index, project] of projectPayload.entries()) {
|
|
||||||
const brainId = project.id.trim();
|
|
||||||
|
|
||||||
if (seenBrainProjectIds.has(brainId)) {
|
|
||||||
skipped += 1;
|
|
||||||
errors.push(`project ${brainId}: duplicate item in request body`);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
seenBrainProjectIds.add(brainId);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const existingProject = await tx.project.findFirst({
|
|
||||||
where: {
|
|
||||||
workspaceId,
|
|
||||||
metadata: {
|
|
||||||
path: ["brainId"],
|
|
||||||
equals: brainId,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
select: { id: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (existingProject) {
|
|
||||||
skipped += 1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const mappedStatus = this.mapProjectStatus(project.status ?? null);
|
|
||||||
if (mappedStatus.issue) {
|
|
||||||
errors.push(`project ${brainId}: ${mappedStatus.issue}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const domainId = await this.resolveDomainId(
|
|
||||||
tx,
|
|
||||||
workspaceId,
|
|
||||||
project.domain ?? null,
|
|
||||||
importTimestamp,
|
|
||||||
domainIdBySlug
|
|
||||||
);
|
|
||||||
|
|
||||||
const createdAt =
|
|
||||||
this.normalizeDate(project.created ?? null, `project ${brainId}.created`, errors) ??
|
|
||||||
new Date();
|
|
||||||
const updatedAt =
|
|
||||||
this.normalizeDate(project.updated ?? null, `project ${brainId}.updated`, errors) ??
|
|
||||||
createdAt;
|
|
||||||
const startDate = this.normalizeDate(
|
|
||||||
project.created ?? null,
|
|
||||||
`project ${brainId}.startDate`,
|
|
||||||
errors
|
|
||||||
);
|
|
||||||
const endDate = this.normalizeDate(
|
|
||||||
project.target_date ?? null,
|
|
||||||
`project ${brainId}.target_date`,
|
|
||||||
errors
|
|
||||||
);
|
|
||||||
|
|
||||||
const metadata = this.asJsonValue({
|
|
||||||
source: "jarvis-brain",
|
|
||||||
brainId,
|
|
||||||
brainDomain: project.domain ?? null,
|
|
||||||
rawStatus: project.status ?? null,
|
|
||||||
rawPriority: project.priority ?? null,
|
|
||||||
progress: project.progress ?? null,
|
|
||||||
repo: project.repo ?? null,
|
|
||||||
branch: project.branch ?? null,
|
|
||||||
currentMilestone: project.current_milestone ?? null,
|
|
||||||
nextMilestone: project.next_milestone ?? null,
|
|
||||||
blocker: project.blocker ?? null,
|
|
||||||
owner: project.owner ?? null,
|
|
||||||
docsPath: project.docs_path ?? null,
|
|
||||||
targetDate: project.target_date ?? null,
|
|
||||||
notes: project.notes ?? null,
|
|
||||||
notesNonTechnical: project.notes_nontechnical ?? null,
|
|
||||||
parent: project.parent ?? null,
|
|
||||||
importedAt: importTimestamp,
|
|
||||||
});
|
|
||||||
|
|
||||||
await tx.project.create({
|
|
||||||
data: {
|
|
||||||
workspaceId,
|
|
||||||
name: project.name,
|
|
||||||
description: project.description ?? null,
|
|
||||||
status: mappedStatus.status,
|
|
||||||
startDate,
|
|
||||||
endDate,
|
|
||||||
creatorId: userId,
|
|
||||||
domainId,
|
|
||||||
metadata,
|
|
||||||
createdAt,
|
|
||||||
updatedAt,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
imported += 1;
|
|
||||||
} catch (error) {
|
|
||||||
skipped += 1;
|
|
||||||
errors.push(
|
|
||||||
`project ${brainId || `index-${String(index)}`}: failed to import: ${this.getErrorMessage(error)}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
imported,
|
|
||||||
skipped,
|
|
||||||
errors,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private async resolveProjectId(
|
|
||||||
tx: PrismaClient,
|
|
||||||
workspaceId: string,
|
|
||||||
projectBrainId: string | null,
|
|
||||||
projectIdByBrainId: Map<string, string | null>,
|
|
||||||
taskBrainId: string,
|
|
||||||
errors: string[]
|
|
||||||
): Promise<string | null> {
|
|
||||||
if (!projectBrainId) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (projectIdByBrainId.has(projectBrainId)) {
|
|
||||||
return projectIdByBrainId.get(projectBrainId) ?? null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const existingProject = await tx.project.findFirst({
|
|
||||||
where: {
|
|
||||||
workspaceId,
|
|
||||||
metadata: {
|
|
||||||
path: ["brainId"],
|
|
||||||
equals: projectBrainId,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
select: { id: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!existingProject) {
|
|
||||||
projectIdByBrainId.set(projectBrainId, null);
|
|
||||||
errors.push(`task ${taskBrainId}: referenced project "${projectBrainId}" not found`);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
projectIdByBrainId.set(projectBrainId, existingProject.id);
|
|
||||||
return existingProject.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async resolveDomainId(
|
|
||||||
tx: PrismaClient,
|
|
||||||
workspaceId: string,
|
|
||||||
rawDomain: string | null,
|
|
||||||
importTimestamp: string,
|
|
||||||
domainIdBySlug: Map<string, string>
|
|
||||||
): Promise<string | null> {
|
|
||||||
const domainSlug = this.normalizeDomain(rawDomain);
|
|
||||||
if (!domainSlug) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const cachedId = domainIdBySlug.get(domainSlug);
|
|
||||||
if (cachedId) {
|
|
||||||
return cachedId;
|
|
||||||
}
|
|
||||||
|
|
||||||
const existingDomain = await tx.domain.findUnique({
|
|
||||||
where: {
|
|
||||||
workspaceId_slug: {
|
|
||||||
workspaceId,
|
|
||||||
slug: domainSlug,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
select: { id: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (existingDomain) {
|
|
||||||
domainIdBySlug.set(domainSlug, existingDomain.id);
|
|
||||||
return existingDomain.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
const trimmedDomainName = rawDomain?.trim();
|
|
||||||
const domainName =
|
|
||||||
trimmedDomainName && trimmedDomainName.length > 0 ? trimmedDomainName : domainSlug;
|
|
||||||
const createdDomain = await tx.domain.create({
|
|
||||||
data: {
|
|
||||||
workspaceId,
|
|
||||||
slug: domainSlug,
|
|
||||||
name: domainName,
|
|
||||||
metadata: this.asJsonValue({
|
|
||||||
source: "jarvis-brain",
|
|
||||||
brainId: domainName,
|
|
||||||
sourceValues: [domainName],
|
|
||||||
importedAt: importTimestamp,
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
select: { id: true },
|
|
||||||
});
|
|
||||||
|
|
||||||
domainIdBySlug.set(domainSlug, createdDomain.id);
|
|
||||||
return createdDomain.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
private normalizeKey(value: string | null | undefined): string {
|
|
||||||
return value?.trim().toLowerCase() ?? "";
|
|
||||||
}
|
|
||||||
|
|
||||||
private mapTaskStatus(rawStatus: string | null): TaskStatusMapping {
|
|
||||||
const statusKey = this.normalizeKey(rawStatus);
|
|
||||||
|
|
||||||
switch (statusKey) {
|
|
||||||
case "done":
|
|
||||||
return { status: TaskStatus.COMPLETED, issue: null };
|
|
||||||
case "in-progress":
|
|
||||||
return { status: TaskStatus.IN_PROGRESS, issue: null };
|
|
||||||
case "backlog":
|
|
||||||
case "pending":
|
|
||||||
case "scheduled":
|
|
||||||
case "not-started":
|
|
||||||
case "planned":
|
|
||||||
return { status: TaskStatus.NOT_STARTED, issue: null };
|
|
||||||
case "blocked":
|
|
||||||
case "on-hold":
|
|
||||||
return { status: TaskStatus.PAUSED, issue: null };
|
|
||||||
case "cancelled":
|
|
||||||
return { status: TaskStatus.ARCHIVED, issue: null };
|
|
||||||
default:
|
|
||||||
return {
|
|
||||||
status: TaskStatus.NOT_STARTED,
|
|
||||||
issue: `Unknown task status "${rawStatus ?? "null"}" mapped to NOT_STARTED`,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private mapTaskPriority(rawPriority: string | null): TaskPriorityMapping {
|
|
||||||
const priorityKey = this.normalizeKey(rawPriority);
|
|
||||||
|
|
||||||
switch (priorityKey) {
|
|
||||||
case "critical":
|
|
||||||
case "high":
|
|
||||||
return { priority: TaskPriority.HIGH, issue: null };
|
|
||||||
case "medium":
|
|
||||||
return { priority: TaskPriority.MEDIUM, issue: null };
|
|
||||||
case "low":
|
|
||||||
return { priority: TaskPriority.LOW, issue: null };
|
|
||||||
default:
|
|
||||||
return {
|
|
||||||
priority: TaskPriority.MEDIUM,
|
|
||||||
issue: `Unknown task priority "${rawPriority ?? "null"}" mapped to MEDIUM`,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private mapProjectStatus(rawStatus: string | null): ProjectStatusMapping {
|
|
||||||
const statusKey = this.normalizeKey(rawStatus);
|
|
||||||
|
|
||||||
switch (statusKey) {
|
|
||||||
case "active":
|
|
||||||
case "in-progress":
|
|
||||||
return { status: ProjectStatus.ACTIVE, issue: null };
|
|
||||||
case "backlog":
|
|
||||||
case "planning":
|
|
||||||
return { status: ProjectStatus.PLANNING, issue: null };
|
|
||||||
case "paused":
|
|
||||||
case "blocked":
|
|
||||||
return { status: ProjectStatus.PAUSED, issue: null };
|
|
||||||
case "archived":
|
|
||||||
case "maintenance":
|
|
||||||
return { status: ProjectStatus.ARCHIVED, issue: null };
|
|
||||||
default:
|
|
||||||
return {
|
|
||||||
status: ProjectStatus.PLANNING,
|
|
||||||
issue: `Unknown project status "${rawStatus ?? "null"}" mapped to PLANNING`,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private normalizeDomain(rawDomain: string | null | undefined): string | null {
|
|
||||||
if (!rawDomain) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const trimmed = rawDomain.trim();
|
|
||||||
if (trimmed.length === 0) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const slug = trimmed
|
|
||||||
.toLowerCase()
|
|
||||||
.replace(/[^a-z0-9]+/g, "-")
|
|
||||||
.replace(/^-+|-+$/g, "");
|
|
||||||
|
|
||||||
return slug.length > 0 ? slug : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private normalizeDate(rawValue: string | null, context: string, errors: string[]): Date | null {
|
|
||||||
if (!rawValue) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const trimmed = rawValue.trim();
|
|
||||||
if (trimmed.length === 0) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const value = /^\d{4}-\d{2}-\d{2}$/.test(trimmed) ? `${trimmed}T00:00:00.000Z` : trimmed;
|
|
||||||
const parsedDate = new Date(value);
|
|
||||||
|
|
||||||
if (Number.isNaN(parsedDate.getTime())) {
|
|
||||||
errors.push(`${context}: invalid date "${rawValue}"`);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return parsedDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
private asJsonValue(value: Record<string, unknown>): Prisma.InputJsonValue {
|
|
||||||
return value as Prisma.InputJsonValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
private getErrorMessage(error: unknown): string {
|
|
||||||
if (error instanceof Error) {
|
|
||||||
return error.message;
|
|
||||||
}
|
|
||||||
|
|
||||||
return String(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -50,12 +50,6 @@ export class CreateTaskDto {
|
|||||||
@IsUUID("4", { message: "parentId must be a valid UUID" })
|
@IsUUID("4", { message: "parentId must be a valid UUID" })
|
||||||
parentId?: string;
|
parentId?: string;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "assignedAgent must be a string" })
|
|
||||||
@MinLength(1, { message: "assignedAgent must not be empty" })
|
|
||||||
@MaxLength(255, { message: "assignedAgent must not exceed 255 characters" })
|
|
||||||
assignedAgent?: string;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsInt({ message: "sortOrder must be an integer" })
|
@IsInt({ message: "sortOrder must be an integer" })
|
||||||
@Min(0, { message: "sortOrder must be at least 0" })
|
@Min(0, { message: "sortOrder must be at least 0" })
|
||||||
|
|||||||
@@ -52,12 +52,6 @@ export class UpdateTaskDto {
|
|||||||
@IsUUID("4", { message: "parentId must be a valid UUID" })
|
@IsUUID("4", { message: "parentId must be a valid UUID" })
|
||||||
parentId?: string | null;
|
parentId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@IsString({ message: "assignedAgent must be a string" })
|
|
||||||
@MinLength(1, { message: "assignedAgent must not be empty" })
|
|
||||||
@MaxLength(255, { message: "assignedAgent must not exceed 255 characters" })
|
|
||||||
assignedAgent?: string | null;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsInt({ message: "sortOrder must be an integer" })
|
@IsInt({ message: "sortOrder must be an integer" })
|
||||||
@Min(0, { message: "sortOrder must be at least 0" })
|
@Min(0, { message: "sortOrder must be at least 0" })
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ describe("TasksService", () => {
|
|||||||
creatorId: mockUserId,
|
creatorId: mockUserId,
|
||||||
projectId: null,
|
projectId: null,
|
||||||
parentId: null,
|
parentId: null,
|
||||||
assignedAgent: null,
|
|
||||||
sortOrder: 0,
|
sortOrder: 0,
|
||||||
metadata: {},
|
metadata: {},
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
@@ -159,28 +158,6 @@ describe("TasksService", () => {
|
|||||||
})
|
})
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should include assignedAgent when provided", async () => {
|
|
||||||
const createDto = {
|
|
||||||
title: "Agent-owned Task",
|
|
||||||
assignedAgent: "fleet-worker-1",
|
|
||||||
};
|
|
||||||
|
|
||||||
mockPrismaService.task.create.mockResolvedValue({
|
|
||||||
...mockTask,
|
|
||||||
assignedAgent: createDto.assignedAgent,
|
|
||||||
});
|
|
||||||
|
|
||||||
await service.create(mockWorkspaceId, mockUserId, createDto);
|
|
||||||
|
|
||||||
expect(prisma.task.create).toHaveBeenCalledWith(
|
|
||||||
expect.objectContaining({
|
|
||||||
data: expect.objectContaining({
|
|
||||||
assignedAgent: createDto.assignedAgent,
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("findAll", () => {
|
describe("findAll", () => {
|
||||||
@@ -492,26 +469,6 @@ describe("TasksService", () => {
|
|||||||
service.update(mockTaskId, mockWorkspaceId, mockUserId, { title: "Test" })
|
service.update(mockTaskId, mockWorkspaceId, mockUserId, { title: "Test" })
|
||||||
).rejects.toThrow(NotFoundException);
|
).rejects.toThrow(NotFoundException);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should update assignedAgent when provided", async () => {
|
|
||||||
const updateDto = { assignedAgent: "fleet-worker-2" };
|
|
||||||
|
|
||||||
mockPrismaService.task.findUnique.mockResolvedValue(mockTask);
|
|
||||||
mockPrismaService.task.update.mockResolvedValue({
|
|
||||||
...mockTask,
|
|
||||||
assignedAgent: updateDto.assignedAgent,
|
|
||||||
});
|
|
||||||
|
|
||||||
await service.update(mockTaskId, mockWorkspaceId, mockUserId, updateDto);
|
|
||||||
|
|
||||||
expect(prisma.task.update).toHaveBeenCalledWith(
|
|
||||||
expect.objectContaining({
|
|
||||||
data: expect.objectContaining({
|
|
||||||
assignedAgent: updateDto.assignedAgent,
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("remove", () => {
|
describe("remove", () => {
|
||||||
|
|||||||
@@ -67,9 +67,6 @@ export class TasksService {
|
|||||||
metadata: createTaskDto.metadata
|
metadata: createTaskDto.metadata
|
||||||
? (createTaskDto.metadata as unknown as Prisma.InputJsonValue)
|
? (createTaskDto.metadata as unknown as Prisma.InputJsonValue)
|
||||||
: {},
|
: {},
|
||||||
...(createTaskDto.assignedAgent !== undefined && {
|
|
||||||
assignedAgent: createTaskDto.assignedAgent,
|
|
||||||
}),
|
|
||||||
...(assigneeConnection && { assignee: assigneeConnection }),
|
...(assigneeConnection && { assignee: assigneeConnection }),
|
||||||
...(projectConnection && { project: projectConnection }),
|
...(projectConnection && { project: projectConnection }),
|
||||||
...(parentConnection && { parent: parentConnection }),
|
...(parentConnection && { parent: parentConnection }),
|
||||||
@@ -294,9 +291,6 @@ export class TasksService {
|
|||||||
if (updateTaskDto.parentId !== undefined && updateTaskDto.parentId !== null) {
|
if (updateTaskDto.parentId !== undefined && updateTaskDto.parentId !== null) {
|
||||||
data.parent = { connect: { id: updateTaskDto.parentId } };
|
data.parent = { connect: { id: updateTaskDto.parentId } };
|
||||||
}
|
}
|
||||||
if (updateTaskDto.assignedAgent !== undefined) {
|
|
||||||
data.assignedAgent = updateTaskDto.assignedAgent;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle completedAt based on status changes
|
// Handle completedAt based on status changes
|
||||||
if (updateTaskDto.status) {
|
if (updateTaskDto.status) {
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useCallback, useEffect, useState } from "react";
|
import { useState } from "react";
|
||||||
import type { ReactElement, ReactNode } from "react";
|
import type { ReactElement, ReactNode } from "react";
|
||||||
import { WorkspaceMemberRole } from "@mosaic/shared";
|
|
||||||
import { useAuth } from "@/lib/auth/auth-context";
|
|
||||||
import { fetchUserWorkspaces } from "@/lib/api/workspaces";
|
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
|
||||||
interface CategoryConfig {
|
interface CategoryConfig {
|
||||||
@@ -14,7 +11,6 @@ interface CategoryConfig {
|
|||||||
accent: string;
|
accent: string;
|
||||||
iconBg: string;
|
iconBg: string;
|
||||||
icon: ReactNode;
|
icon: ReactNode;
|
||||||
adminOnly?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface SettingsCategoryCardProps {
|
interface SettingsCategoryCardProps {
|
||||||
@@ -200,57 +196,6 @@ const categories: CategoryConfig[] = [
|
|||||||
</svg>
|
</svg>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: "Users",
|
|
||||||
description: "Invite, manage roles, and deactivate users across your workspaces.",
|
|
||||||
href: "/settings/users",
|
|
||||||
adminOnly: true,
|
|
||||||
accent: "var(--ms-green-400)",
|
|
||||||
iconBg: "rgba(34, 197, 94, 0.12)",
|
|
||||||
icon: (
|
|
||||||
<svg
|
|
||||||
width="20"
|
|
||||||
height="20"
|
|
||||||
viewBox="0 0 20 20"
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeWidth="1.5"
|
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<circle cx="8" cy="7" r="2.5" />
|
|
||||||
<circle cx="13.5" cy="8.5" r="2" />
|
|
||||||
<path d="M3.5 16c0-2.5 2-4.5 4.5-4.5s4.5 2 4.5 4.5" />
|
|
||||||
<path d="M12 13.8c.5-.8 1.4-1.3 2.5-1.3 1.7 0 3 1.3 3 3" />
|
|
||||||
</svg>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: "Teams",
|
|
||||||
description: "Create and manage teams within your active workspace.",
|
|
||||||
href: "/settings/teams",
|
|
||||||
accent: "var(--ms-blue-400)",
|
|
||||||
iconBg: "rgba(47, 128, 255, 0.12)",
|
|
||||||
icon: (
|
|
||||||
<svg
|
|
||||||
width="20"
|
|
||||||
height="20"
|
|
||||||
viewBox="0 0 20 20"
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeWidth="1.5"
|
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<circle cx="7" cy="7" r="2.25" />
|
|
||||||
<circle cx="13" cy="7" r="2.25" />
|
|
||||||
<path d="M3 15c0-2.2 1.8-4 4-4s4 1.8 4 4" />
|
|
||||||
<path d="M9 15c0-2.2 1.8-4 4-4s4 1.8 4 4" />
|
|
||||||
</svg>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: "Workspaces",
|
title: "Workspaces",
|
||||||
description:
|
description:
|
||||||
@@ -282,30 +227,7 @@ const categories: CategoryConfig[] = [
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const ADMIN_ROLES: WorkspaceMemberRole[] = [WorkspaceMemberRole.OWNER, WorkspaceMemberRole.ADMIN];
|
|
||||||
|
|
||||||
export default function SettingsPage(): ReactElement {
|
export default function SettingsPage(): ReactElement {
|
||||||
const { user } = useAuth();
|
|
||||||
const [isAdmin, setIsAdmin] = useState<boolean>(false);
|
|
||||||
|
|
||||||
const checkRole = useCallback(async (): Promise<void> => {
|
|
||||||
if (user === null) return;
|
|
||||||
try {
|
|
||||||
const workspaces = await fetchUserWorkspaces();
|
|
||||||
const hasAdminRole = workspaces.some((ws) => ADMIN_ROLES.includes(ws.role));
|
|
||||||
setIsAdmin(hasAdminRole);
|
|
||||||
} catch {
|
|
||||||
// Fail open — show all items if we can't determine role
|
|
||||||
setIsAdmin(true);
|
|
||||||
}
|
|
||||||
}, [user]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
void checkRole();
|
|
||||||
}, [checkRole]);
|
|
||||||
|
|
||||||
const visibleCategories = categories.filter((c) => c.adminOnly !== true || isAdmin);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="max-w-6xl mx-auto p-6">
|
<div className="max-w-6xl mx-auto p-6">
|
||||||
{/* Page header */}
|
{/* Page header */}
|
||||||
@@ -333,7 +255,7 @@ export default function SettingsPage(): ReactElement {
|
|||||||
|
|
||||||
{/* Category grid */}
|
{/* Category grid */}
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||||
{visibleCategories.map((category) => (
|
{categories.map((category) => (
|
||||||
<SettingsCategoryCard key={category.href} category={category} />
|
<SettingsCategoryCard key={category.href} category={category} />
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,76 +0,0 @@
|
|||||||
import type { ReactElement, ReactNode } from "react";
|
|
||||||
import type { TeamRecord } from "@/lib/api/teams";
|
|
||||||
|
|
||||||
import { render, screen } from "@testing-library/react";
|
|
||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
||||||
import { fetchTeams } from "@/lib/api/teams";
|
|
||||||
|
|
||||||
import TeamsSettingsPage from "./page";
|
|
||||||
|
|
||||||
vi.mock("next/link", () => ({
|
|
||||||
default: function LinkMock({
|
|
||||||
children,
|
|
||||||
href,
|
|
||||||
}: {
|
|
||||||
children: ReactNode;
|
|
||||||
href: string;
|
|
||||||
}): ReactElement {
|
|
||||||
return <a href={href}>{children}</a>;
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("@/lib/api/teams", () => ({
|
|
||||||
fetchTeams: vi.fn(),
|
|
||||||
createTeam: vi.fn(),
|
|
||||||
}));
|
|
||||||
|
|
||||||
const fetchTeamsMock = vi.mocked(fetchTeams);
|
|
||||||
|
|
||||||
const baseTeam: TeamRecord = {
|
|
||||||
id: "team-1",
|
|
||||||
workspaceId: "workspace-1",
|
|
||||||
name: "Platform Team",
|
|
||||||
description: "Owns platform services",
|
|
||||||
metadata: {},
|
|
||||||
createdAt: "2026-02-01T00:00:00.000Z",
|
|
||||||
updatedAt: "2026-02-01T00:00:00.000Z",
|
|
||||||
_count: {
|
|
||||||
members: 3,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
describe("TeamsSettingsPage", () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("loads and renders teams from the API", async () => {
|
|
||||||
fetchTeamsMock.mockResolvedValue([baseTeam]);
|
|
||||||
|
|
||||||
render(<TeamsSettingsPage />);
|
|
||||||
|
|
||||||
expect(screen.getByText("Loading teams...")).toBeInTheDocument();
|
|
||||||
|
|
||||||
expect(await screen.findByText("Your Teams (1)")).toBeInTheDocument();
|
|
||||||
expect(screen.getByText("Platform Team")).toBeInTheDocument();
|
|
||||||
expect(fetchTeamsMock).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("shows empty state when the API returns no teams", async () => {
|
|
||||||
fetchTeamsMock.mockResolvedValue([]);
|
|
||||||
|
|
||||||
render(<TeamsSettingsPage />);
|
|
||||||
|
|
||||||
expect(await screen.findByText("Your Teams (0)")).toBeInTheDocument();
|
|
||||||
expect(screen.getByText("No teams yet")).toBeInTheDocument();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("shows error state and does not show empty state", async () => {
|
|
||||||
fetchTeamsMock.mockRejectedValue(new Error("Unable to load teams"));
|
|
||||||
|
|
||||||
render(<TeamsSettingsPage />);
|
|
||||||
|
|
||||||
expect(await screen.findByText("Unable to load teams")).toBeInTheDocument();
|
|
||||||
expect(screen.queryByText("No teams yet")).not.toBeInTheDocument();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,244 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import type { ReactElement, SyntheticEvent } from "react";
|
|
||||||
|
|
||||||
import { useCallback, useEffect, useState } from "react";
|
|
||||||
import Link from "next/link";
|
|
||||||
import { createTeam, fetchTeams, type CreateTeamDto, type TeamRecord } from "@/lib/api/teams";
|
|
||||||
|
|
||||||
function getErrorMessage(error: unknown, fallback: string): string {
|
|
||||||
if (error instanceof Error) {
|
|
||||||
return error.message;
|
|
||||||
}
|
|
||||||
|
|
||||||
return fallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function TeamsSettingsPage(): ReactElement {
|
|
||||||
const [teams, setTeams] = useState<TeamRecord[]>([]);
|
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
|
||||||
const [loadError, setLoadError] = useState<string | null>(null);
|
|
||||||
const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
|
|
||||||
const [isCreating, setIsCreating] = useState(false);
|
|
||||||
const [newTeamName, setNewTeamName] = useState("");
|
|
||||||
const [newTeamDescription, setNewTeamDescription] = useState("");
|
|
||||||
const [createError, setCreateError] = useState<string | null>(null);
|
|
||||||
|
|
||||||
const loadTeams = useCallback(async (): Promise<void> => {
|
|
||||||
setIsLoading(true);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const data = await fetchTeams();
|
|
||||||
setTeams(data);
|
|
||||||
setLoadError(null);
|
|
||||||
} catch (error) {
|
|
||||||
setLoadError(getErrorMessage(error, "Failed to load teams"));
|
|
||||||
} finally {
|
|
||||||
setIsLoading(false);
|
|
||||||
}
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
void loadTeams();
|
|
||||||
}, [loadTeams]);
|
|
||||||
|
|
||||||
const handleCreateTeam = async (e: SyntheticEvent<HTMLFormElement>): Promise<void> => {
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
const teamName = newTeamName.trim();
|
|
||||||
if (!teamName) return;
|
|
||||||
|
|
||||||
setIsCreating(true);
|
|
||||||
setCreateError(null);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const description = newTeamDescription.trim();
|
|
||||||
const dto: CreateTeamDto = { name: teamName };
|
|
||||||
if (description.length > 0) {
|
|
||||||
dto.description = description;
|
|
||||||
}
|
|
||||||
|
|
||||||
await createTeam(dto);
|
|
||||||
setNewTeamName("");
|
|
||||||
setNewTeamDescription("");
|
|
||||||
setIsCreateDialogOpen(false);
|
|
||||||
await loadTeams();
|
|
||||||
} catch (error) {
|
|
||||||
setCreateError(getErrorMessage(error, "Failed to create team"));
|
|
||||||
} finally {
|
|
||||||
setIsCreating(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<main className="container mx-auto px-4 py-8 max-w-5xl">
|
|
||||||
<div className="mb-8">
|
|
||||||
<div className="flex items-center justify-between mb-2">
|
|
||||||
<h1 className="text-3xl font-bold text-gray-900">Teams</h1>
|
|
||||||
<Link href="/settings" className="text-sm text-blue-600 hover:text-blue-700">
|
|
||||||
{"<-"} Back to Settings
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
<p className="text-gray-600">Manage teams in your active workspace</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="bg-white rounded-lg shadow-sm border border-gray-200 p-6 mb-6">
|
|
||||||
<div className="flex items-center justify-between gap-4">
|
|
||||||
<div>
|
|
||||||
<h2 className="text-lg font-semibold text-gray-900">Create New Team</h2>
|
|
||||||
<p className="text-sm text-gray-600 mt-1">
|
|
||||||
Add a team to organize members and permissions.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => {
|
|
||||||
setCreateError(null);
|
|
||||||
setIsCreateDialogOpen(true);
|
|
||||||
}}
|
|
||||||
className="px-6 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 font-medium"
|
|
||||||
>
|
|
||||||
Create Team
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{isCreateDialogOpen && (
|
|
||||||
<div
|
|
||||||
className="fixed inset-0 z-50 flex items-center justify-center bg-black/40 px-4"
|
|
||||||
role="dialog"
|
|
||||||
>
|
|
||||||
<div className="w-full max-w-lg rounded-lg border border-gray-200 bg-white p-6 shadow-xl">
|
|
||||||
<h3 className="text-lg font-semibold text-gray-900">Create New Team</h3>
|
|
||||||
<p className="mt-1 text-sm text-gray-600">
|
|
||||||
Enter a team name and optional description.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<form onSubmit={handleCreateTeam} className="mt-4 space-y-4">
|
|
||||||
<div>
|
|
||||||
<label htmlFor="team-name" className="mb-1 block text-sm font-medium text-gray-700">
|
|
||||||
Team Name
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="team-name"
|
|
||||||
type="text"
|
|
||||||
value={newTeamName}
|
|
||||||
onChange={(e) => {
|
|
||||||
setNewTeamName(e.target.value);
|
|
||||||
}}
|
|
||||||
placeholder="Enter team name..."
|
|
||||||
disabled={isCreating}
|
|
||||||
className="w-full rounded-lg border border-gray-300 px-4 py-2 focus:border-transparent focus:ring-2 focus:ring-blue-500 disabled:bg-gray-100"
|
|
||||||
autoFocus
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label
|
|
||||||
htmlFor="team-description"
|
|
||||||
className="mb-1 block text-sm font-medium text-gray-700"
|
|
||||||
>
|
|
||||||
Description (optional)
|
|
||||||
</label>
|
|
||||||
<textarea
|
|
||||||
id="team-description"
|
|
||||||
value={newTeamDescription}
|
|
||||||
onChange={(e) => {
|
|
||||||
setNewTeamDescription(e.target.value);
|
|
||||||
}}
|
|
||||||
placeholder="Describe this team's purpose..."
|
|
||||||
disabled={isCreating}
|
|
||||||
rows={3}
|
|
||||||
className="w-full rounded-lg border border-gray-300 px-4 py-2 focus:border-transparent focus:ring-2 focus:ring-blue-500 disabled:bg-gray-100"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{createError !== null && (
|
|
||||||
<div className="rounded-md border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">
|
|
||||||
{createError}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div className="flex justify-end gap-3">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => {
|
|
||||||
if (!isCreating) {
|
|
||||||
setIsCreateDialogOpen(false);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
disabled={isCreating}
|
|
||||||
className="px-4 py-2 rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 disabled:cursor-not-allowed"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="submit"
|
|
||||||
disabled={isCreating || !newTeamName.trim()}
|
|
||||||
className="px-5 py-2 rounded-lg bg-blue-600 text-white font-medium hover:bg-blue-700 disabled:cursor-not-allowed disabled:opacity-50"
|
|
||||||
>
|
|
||||||
{isCreating ? "Creating..." : "Create Team"}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div className="space-y-4">
|
|
||||||
<h2 className="text-xl font-semibold text-gray-900">
|
|
||||||
Your Teams ({isLoading ? "..." : teams.length})
|
|
||||||
</h2>
|
|
||||||
{loadError !== null ? (
|
|
||||||
<div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-red-700">
|
|
||||||
{loadError}
|
|
||||||
</div>
|
|
||||||
) : isLoading ? (
|
|
||||||
<div className="bg-white rounded-lg shadow-sm border border-gray-200 p-12 text-center text-gray-600">
|
|
||||||
Loading teams...
|
|
||||||
</div>
|
|
||||||
) : teams.length === 0 ? (
|
|
||||||
<div className="bg-white rounded-lg shadow-sm border border-gray-200 p-12 text-center">
|
|
||||||
<svg
|
|
||||||
className="mx-auto h-12 w-12 text-gray-400 mb-4"
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
strokeWidth={2}
|
|
||||||
d="M17 20h5V8H2v12h5m10 0v-4a3 3 0 10-6 0v4m6 0H7"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
<h3 className="text-lg font-medium text-gray-900 mb-2">No teams yet</h3>
|
|
||||||
<p className="text-gray-600">Create your first team to get started</p>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
|
||||||
{teams.map((team) => (
|
|
||||||
<article
|
|
||||||
key={team.id}
|
|
||||||
className="rounded-lg border border-gray-200 bg-white p-5 shadow-sm"
|
|
||||||
data-testid="team-card"
|
|
||||||
>
|
|
||||||
<h3 className="text-lg font-semibold text-gray-900">{team.name}</h3>
|
|
||||||
{team.description ? (
|
|
||||||
<p className="mt-1 text-sm text-gray-600">{team.description}</p>
|
|
||||||
) : (
|
|
||||||
<p className="mt-1 text-sm text-gray-400 italic">No description</p>
|
|
||||||
)}
|
|
||||||
<div className="mt-4 flex items-center gap-3 text-xs text-gray-500">
|
|
||||||
<span>{team._count?.members ?? 0} members</span>
|
|
||||||
<span>|</span>
|
|
||||||
<span>Created {new Date(team.createdAt).toLocaleDateString()}</span>
|
|
||||||
</div>
|
|
||||||
</article>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,550 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import {
|
|
||||||
useCallback,
|
|
||||||
useEffect,
|
|
||||||
useState,
|
|
||||||
type ChangeEvent,
|
|
||||||
type ReactElement,
|
|
||||||
type SyntheticEvent,
|
|
||||||
} from "react";
|
|
||||||
import Link from "next/link";
|
|
||||||
import { Pencil, UserPlus, UserX } from "lucide-react";
|
|
||||||
import { WorkspaceMemberRole } from "@mosaic/shared";
|
|
||||||
import { Badge } from "@/components/ui/badge";
|
|
||||||
import { Button } from "@/components/ui/button";
|
|
||||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
|
|
||||||
import {
|
|
||||||
Dialog,
|
|
||||||
DialogContent,
|
|
||||||
DialogDescription,
|
|
||||||
DialogFooter,
|
|
||||||
DialogHeader,
|
|
||||||
DialogTitle,
|
|
||||||
DialogTrigger,
|
|
||||||
} from "@/components/ui/dialog";
|
|
||||||
import { Input } from "@/components/ui/input";
|
|
||||||
import { Label } from "@/components/ui/label";
|
|
||||||
import {
|
|
||||||
Select,
|
|
||||||
SelectContent,
|
|
||||||
SelectItem,
|
|
||||||
SelectTrigger,
|
|
||||||
SelectValue,
|
|
||||||
} from "@/components/ui/select";
|
|
||||||
import {
|
|
||||||
AlertDialog,
|
|
||||||
AlertDialogAction,
|
|
||||||
AlertDialogCancel,
|
|
||||||
AlertDialogContent,
|
|
||||||
AlertDialogDescription,
|
|
||||||
AlertDialogFooter,
|
|
||||||
AlertDialogHeader,
|
|
||||||
AlertDialogTitle,
|
|
||||||
} from "@/components/ui/alert-dialog";
|
|
||||||
import { fetchUserWorkspaces } from "@/lib/api/workspaces";
|
|
||||||
import {
|
|
||||||
deactivateUser,
|
|
||||||
fetchAdminUsers,
|
|
||||||
inviteUser,
|
|
||||||
updateUser,
|
|
||||||
type AdminUser,
|
|
||||||
type AdminUsersResponse,
|
|
||||||
type InviteUserDto,
|
|
||||||
type UpdateUserDto,
|
|
||||||
} from "@/lib/api/admin";
|
|
||||||
|
|
||||||
const ROLE_PRIORITY: Record<WorkspaceMemberRole, number> = {
|
|
||||||
[WorkspaceMemberRole.OWNER]: 4,
|
|
||||||
[WorkspaceMemberRole.ADMIN]: 3,
|
|
||||||
[WorkspaceMemberRole.MEMBER]: 2,
|
|
||||||
[WorkspaceMemberRole.GUEST]: 1,
|
|
||||||
};
|
|
||||||
|
|
||||||
const INITIAL_INVITE_FORM = {
|
|
||||||
email: "",
|
|
||||||
name: "",
|
|
||||||
workspaceId: "",
|
|
||||||
role: WorkspaceMemberRole.MEMBER,
|
|
||||||
};
|
|
||||||
|
|
||||||
function toRoleLabel(role: WorkspaceMemberRole): string {
|
|
||||||
return `${role.charAt(0)}${role.slice(1).toLowerCase()}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPrimaryRole(user: AdminUser): WorkspaceMemberRole | null {
|
|
||||||
const [firstMembership, ...restMemberships] = user.workspaceMemberships;
|
|
||||||
if (!firstMembership) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return restMemberships.reduce((highest, membership) => {
|
|
||||||
if (ROLE_PRIORITY[membership.role] > ROLE_PRIORITY[highest]) {
|
|
||||||
return membership.role;
|
|
||||||
}
|
|
||||||
return highest;
|
|
||||||
}, firstMembership.role);
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function UsersSettingsPage(): ReactElement {
|
|
||||||
const [users, setUsers] = useState<AdminUser[]>([]);
|
|
||||||
const [meta, setMeta] = useState<AdminUsersResponse["meta"] | null>(null);
|
|
||||||
const [isLoading, setIsLoading] = useState<boolean>(true);
|
|
||||||
const [isRefreshing, setIsRefreshing] = useState<boolean>(false);
|
|
||||||
const [error, setError] = useState<string | null>(null);
|
|
||||||
|
|
||||||
const [isInviteOpen, setIsInviteOpen] = useState<boolean>(false);
|
|
||||||
const [inviteForm, setInviteForm] = useState(INITIAL_INVITE_FORM);
|
|
||||||
const [inviteError, setInviteError] = useState<string | null>(null);
|
|
||||||
const [isInviting, setIsInviting] = useState<boolean>(false);
|
|
||||||
|
|
||||||
const [deactivateTarget, setDeactivateTarget] = useState<AdminUser | null>(null);
|
|
||||||
const [isDeactivating, setIsDeactivating] = useState<boolean>(false);
|
|
||||||
|
|
||||||
const [editTarget, setEditTarget] = useState<AdminUser | null>(null);
|
|
||||||
const [editName, setEditName] = useState<string>("");
|
|
||||||
const [editError, setEditError] = useState<string | null>(null);
|
|
||||||
const [isEditing, setIsEditing] = useState<boolean>(false);
|
|
||||||
|
|
||||||
const [isAdmin, setIsAdmin] = useState<boolean | null>(null);
|
|
||||||
|
|
||||||
const loadUsers = useCallback(async (showLoadingState: boolean): Promise<void> => {
|
|
||||||
try {
|
|
||||||
if (showLoadingState) {
|
|
||||||
setIsLoading(true);
|
|
||||||
} else {
|
|
||||||
setIsRefreshing(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
const response = await fetchAdminUsers(1, 50);
|
|
||||||
setUsers(response.data);
|
|
||||||
setMeta(response.meta);
|
|
||||||
setError(null);
|
|
||||||
} catch (err: unknown) {
|
|
||||||
setError(err instanceof Error ? err.message : "Failed to load admin users");
|
|
||||||
} finally {
|
|
||||||
setIsLoading(false);
|
|
||||||
setIsRefreshing(false);
|
|
||||||
}
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
void loadUsers(true);
|
|
||||||
}, [loadUsers]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
fetchUserWorkspaces()
|
|
||||||
.then((workspaces) => {
|
|
||||||
const adminRoles: WorkspaceMemberRole[] = [
|
|
||||||
WorkspaceMemberRole.OWNER,
|
|
||||||
WorkspaceMemberRole.ADMIN,
|
|
||||||
];
|
|
||||||
setIsAdmin(workspaces.some((ws) => adminRoles.includes(ws.role)));
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
setIsAdmin(true); // fail open
|
|
||||||
});
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
function resetInviteForm(): void {
|
|
||||||
setInviteForm(INITIAL_INVITE_FORM);
|
|
||||||
setInviteError(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleInviteOpenChange(open: boolean): void {
|
|
||||||
if (!open && !isInviting) {
|
|
||||||
resetInviteForm();
|
|
||||||
}
|
|
||||||
setIsInviteOpen(open);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleInviteSubmit(e: SyntheticEvent): Promise<void> {
|
|
||||||
e.preventDefault();
|
|
||||||
setInviteError(null);
|
|
||||||
|
|
||||||
const email = inviteForm.email.trim();
|
|
||||||
if (!email) {
|
|
||||||
setInviteError("Email is required.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const dto: InviteUserDto = { email };
|
|
||||||
|
|
||||||
const name = inviteForm.name.trim();
|
|
||||||
if (name) {
|
|
||||||
dto.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
const workspaceId = inviteForm.workspaceId.trim();
|
|
||||||
if (workspaceId) {
|
|
||||||
dto.workspaceId = workspaceId;
|
|
||||||
dto.role = inviteForm.role;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
setIsInviting(true);
|
|
||||||
await inviteUser(dto);
|
|
||||||
setIsInviteOpen(false);
|
|
||||||
resetInviteForm();
|
|
||||||
await loadUsers(false);
|
|
||||||
} catch (err: unknown) {
|
|
||||||
setInviteError(err instanceof Error ? err.message : "Failed to invite user");
|
|
||||||
} finally {
|
|
||||||
setIsInviting(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function confirmDeactivate(): Promise<void> {
|
|
||||||
if (!deactivateTarget) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
setIsDeactivating(true);
|
|
||||||
await deactivateUser(deactivateTarget.id);
|
|
||||||
setDeactivateTarget(null);
|
|
||||||
await loadUsers(false);
|
|
||||||
setError(null);
|
|
||||||
} catch (err: unknown) {
|
|
||||||
setError(err instanceof Error ? err.message : "Failed to deactivate user");
|
|
||||||
} finally {
|
|
||||||
setIsDeactivating(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleEditSubmit(): Promise<void> {
|
|
||||||
if (editTarget === null) return;
|
|
||||||
setIsEditing(true);
|
|
||||||
setEditError(null);
|
|
||||||
try {
|
|
||||||
const dto: UpdateUserDto = {};
|
|
||||||
if (editName.trim()) dto.name = editName.trim();
|
|
||||||
await updateUser(editTarget.id, dto);
|
|
||||||
setEditTarget(null);
|
|
||||||
await loadUsers(false);
|
|
||||||
} catch (err: unknown) {
|
|
||||||
setEditError(err instanceof Error ? err.message : "Failed to update user");
|
|
||||||
} finally {
|
|
||||||
setIsEditing(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isAdmin === false) {
|
|
||||||
return (
|
|
||||||
<div className="p-8 max-w-2xl">
|
|
||||||
<div className="rounded-lg border border-red-200 bg-red-50 p-6 text-center">
|
|
||||||
<p className="text-lg font-semibold text-red-700">Access Denied</p>
|
|
||||||
<p className="mt-2 text-sm text-red-600">You need Admin or Owner role to manage users.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="max-w-6xl mx-auto p-6 space-y-6">
|
|
||||||
<div className="flex items-start justify-between gap-4">
|
|
||||||
<div>
|
|
||||||
<div className="flex items-center gap-3">
|
|
||||||
<h1 className="text-3xl font-bold">Users</h1>
|
|
||||||
{meta ? <Badge variant="outline">{meta.total} total</Badge> : null}
|
|
||||||
</div>
|
|
||||||
<p className="text-muted-foreground mt-1">Invite and manage workspace users</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
onClick={() => {
|
|
||||||
void loadUsers(false);
|
|
||||||
}}
|
|
||||||
disabled={isLoading || isRefreshing}
|
|
||||||
>
|
|
||||||
{isRefreshing ? "Refreshing..." : "Refresh"}
|
|
||||||
</Button>
|
|
||||||
|
|
||||||
<Dialog open={isInviteOpen} onOpenChange={handleInviteOpenChange}>
|
|
||||||
<DialogTrigger asChild>
|
|
||||||
<Button>
|
|
||||||
<UserPlus className="h-4 w-4 mr-2" />
|
|
||||||
Invite User
|
|
||||||
</Button>
|
|
||||||
</DialogTrigger>
|
|
||||||
<DialogContent>
|
|
||||||
<DialogHeader>
|
|
||||||
<DialogTitle>Invite User</DialogTitle>
|
|
||||||
<DialogDescription>
|
|
||||||
Create an invited account and optionally assign workspace access.
|
|
||||||
</DialogDescription>
|
|
||||||
</DialogHeader>
|
|
||||||
|
|
||||||
<form
|
|
||||||
onSubmit={(e) => {
|
|
||||||
void handleInviteSubmit(e);
|
|
||||||
}}
|
|
||||||
className="space-y-4"
|
|
||||||
>
|
|
||||||
<div className="space-y-2">
|
|
||||||
<Label htmlFor="invite-email">Email</Label>
|
|
||||||
<Input
|
|
||||||
id="invite-email"
|
|
||||||
type="email"
|
|
||||||
value={inviteForm.email}
|
|
||||||
onChange={(e: ChangeEvent<HTMLInputElement>) => {
|
|
||||||
setInviteForm((prev) => ({ ...prev, email: e.target.value }));
|
|
||||||
}}
|
|
||||||
placeholder="user@example.com"
|
|
||||||
maxLength={255}
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="space-y-2">
|
|
||||||
<Label htmlFor="invite-name">Name (optional)</Label>
|
|
||||||
<Input
|
|
||||||
id="invite-name"
|
|
||||||
type="text"
|
|
||||||
value={inviteForm.name}
|
|
||||||
onChange={(e: ChangeEvent<HTMLInputElement>) => {
|
|
||||||
setInviteForm((prev) => ({ ...prev, name: e.target.value }));
|
|
||||||
}}
|
|
||||||
placeholder="Jane Doe"
|
|
||||||
maxLength={255}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="space-y-2">
|
|
||||||
<Label htmlFor="invite-workspace-id">Workspace ID (optional)</Label>
|
|
||||||
<Input
|
|
||||||
id="invite-workspace-id"
|
|
||||||
type="text"
|
|
||||||
value={inviteForm.workspaceId}
|
|
||||||
onChange={(e: ChangeEvent<HTMLInputElement>) => {
|
|
||||||
setInviteForm((prev) => ({ ...prev, workspaceId: e.target.value }));
|
|
||||||
}}
|
|
||||||
placeholder="UUID workspace id"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="space-y-2">
|
|
||||||
<Label htmlFor="invite-role">Role</Label>
|
|
||||||
<Select
|
|
||||||
value={inviteForm.role}
|
|
||||||
onValueChange={(value) => {
|
|
||||||
setInviteForm((prev) => ({ ...prev, role: value as WorkspaceMemberRole }));
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<SelectTrigger id="invite-role">
|
|
||||||
<SelectValue placeholder="Select role" />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
{Object.values(WorkspaceMemberRole).map((role) => (
|
|
||||||
<SelectItem key={role} value={role}>
|
|
||||||
{toRoleLabel(role)}
|
|
||||||
</SelectItem>
|
|
||||||
))}
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
<p className="text-xs text-muted-foreground">
|
|
||||||
Role is only applied when workspace ID is provided.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{inviteError ? (
|
|
||||||
<p className="text-sm text-destructive" role="alert">
|
|
||||||
{inviteError}
|
|
||||||
</p>
|
|
||||||
) : null}
|
|
||||||
|
|
||||||
<DialogFooter>
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="outline"
|
|
||||||
onClick={() => {
|
|
||||||
handleInviteOpenChange(false);
|
|
||||||
}}
|
|
||||||
disabled={isInviting}
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
<Button type="submit" disabled={isInviting}>
|
|
||||||
{isInviting ? "Inviting..." : "Send Invite"}
|
|
||||||
</Button>
|
|
||||||
</DialogFooter>
|
|
||||||
</form>
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<Link href="/settings" className="text-sm text-blue-600 hover:text-blue-700">
|
|
||||||
← Back to Settings
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{error ? (
|
|
||||||
<Card>
|
|
||||||
<CardContent className="py-4">
|
|
||||||
<p className="text-sm text-destructive" role="alert">
|
|
||||||
{error}
|
|
||||||
</p>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
) : null}
|
|
||||||
|
|
||||||
{isLoading ? (
|
|
||||||
<Card>
|
|
||||||
<CardContent className="py-12 text-center text-muted-foreground">
|
|
||||||
Loading users...
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
) : users.length === 0 ? (
|
|
||||||
<Card>
|
|
||||||
<CardHeader>
|
|
||||||
<CardTitle>No Users Yet</CardTitle>
|
|
||||||
<CardDescription>Invite the first user to get started.</CardDescription>
|
|
||||||
</CardHeader>
|
|
||||||
</Card>
|
|
||||||
) : (
|
|
||||||
<Card>
|
|
||||||
<CardHeader>
|
|
||||||
<CardTitle>User Directory</CardTitle>
|
|
||||||
<CardDescription>Name, email, role, and account status.</CardDescription>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent className="space-y-3">
|
|
||||||
{users.map((user) => {
|
|
||||||
const primaryRole = getPrimaryRole(user);
|
|
||||||
const isActive = user.deactivatedAt === null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
key={user.id}
|
|
||||||
className="rounded-md border p-4 flex flex-col gap-3 md:flex-row md:items-center md:justify-between"
|
|
||||||
>
|
|
||||||
<div className="space-y-1 min-w-0">
|
|
||||||
<p className="font-semibold truncate">{user.name || "Unnamed User"}</p>
|
|
||||||
<p className="text-sm text-muted-foreground truncate">{user.email}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex items-center gap-2 flex-wrap md:justify-end">
|
|
||||||
<Badge variant="outline">
|
|
||||||
{primaryRole ? toRoleLabel(primaryRole) : "No role"}
|
|
||||||
</Badge>
|
|
||||||
<Badge variant={isActive ? "secondary" : "destructive"}>
|
|
||||||
{isActive ? "Active" : "Inactive"}
|
|
||||||
</Badge>
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
onClick={() => {
|
|
||||||
setEditTarget(user);
|
|
||||||
setEditName(user.name);
|
|
||||||
setEditError(null);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Pencil className="h-4 w-4 mr-2" />
|
|
||||||
Edit Role
|
|
||||||
</Button>
|
|
||||||
{isActive ? (
|
|
||||||
<Button
|
|
||||||
variant="destructive"
|
|
||||||
size="sm"
|
|
||||||
onClick={() => {
|
|
||||||
setDeactivateTarget(user);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<UserX className="h-4 w-4 mr-2" />
|
|
||||||
Deactivate
|
|
||||||
</Button>
|
|
||||||
) : null}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<AlertDialog
|
|
||||||
open={deactivateTarget !== null}
|
|
||||||
onOpenChange={(open) => {
|
|
||||||
if (!open && !isDeactivating) {
|
|
||||||
setDeactivateTarget(null);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<AlertDialogContent>
|
|
||||||
<AlertDialogHeader>
|
|
||||||
<AlertDialogTitle>Deactivate User</AlertDialogTitle>
|
|
||||||
<AlertDialogDescription>
|
|
||||||
Deactivate {deactivateTarget?.email}? They will no longer be able to access the
|
|
||||||
system.
|
|
||||||
</AlertDialogDescription>
|
|
||||||
</AlertDialogHeader>
|
|
||||||
<AlertDialogFooter>
|
|
||||||
<AlertDialogCancel disabled={isDeactivating}>Cancel</AlertDialogCancel>
|
|
||||||
<AlertDialogAction
|
|
||||||
disabled={isDeactivating}
|
|
||||||
onClick={() => {
|
|
||||||
void confirmDeactivate();
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{isDeactivating ? "Deactivating..." : "Deactivate"}
|
|
||||||
</AlertDialogAction>
|
|
||||||
</AlertDialogFooter>
|
|
||||||
</AlertDialogContent>
|
|
||||||
</AlertDialog>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
|
|
||||||
<Dialog
|
|
||||||
open={editTarget !== null}
|
|
||||||
onOpenChange={(open) => {
|
|
||||||
if (!open && !isEditing) {
|
|
||||||
setEditTarget(null);
|
|
||||||
setEditError(null);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<DialogContent>
|
|
||||||
<DialogHeader>
|
|
||||||
<DialogTitle>Edit User Role</DialogTitle>
|
|
||||||
<DialogDescription>Change role for {editTarget?.email ?? "user"}.</DialogDescription>
|
|
||||||
</DialogHeader>
|
|
||||||
<div className="space-y-4 py-2">
|
|
||||||
{editError !== null ? <p className="text-sm text-destructive">{editError}</p> : null}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<Label htmlFor="edit-name">Display Name</Label>
|
|
||||||
<Input
|
|
||||||
id="edit-name"
|
|
||||||
value={editName}
|
|
||||||
onChange={(e: ChangeEvent<HTMLInputElement>) => {
|
|
||||||
setEditName(e.target.value);
|
|
||||||
}}
|
|
||||||
placeholder="Full name"
|
|
||||||
disabled={isEditing}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<DialogFooter>
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
onClick={() => {
|
|
||||||
setEditTarget(null);
|
|
||||||
}}
|
|
||||||
disabled={isEditing}
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
onClick={() => {
|
|
||||||
void handleEditSubmit();
|
|
||||||
}}
|
|
||||||
disabled={isEditing}
|
|
||||||
>
|
|
||||||
{isEditing ? "Saving..." : "Save"}
|
|
||||||
</Button>
|
|
||||||
</DialogFooter>
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>;
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
|
||||||
import { render, screen, waitFor } from "@testing-library/react";
|
|
||||||
import WorkspaceDetailPage from "./page";
|
|
||||||
import * as workspacesApi from "@/lib/api/workspaces";
|
|
||||||
|
|
||||||
vi.mock("next/navigation", () => ({
|
|
||||||
useParams: (): { id: string } => ({ id: "ws-test-1" }),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("@/lib/auth/auth-context", () => ({
|
|
||||||
useAuth: (): { user: { id: string } } => ({ user: { id: "u1" } }),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("@/lib/api/workspaces");
|
|
||||||
|
|
||||||
vi.mock("@/components/workspace/MemberList", () => ({
|
|
||||||
MemberList: ({ members }: { members: unknown[] }): React.ReactElement => (
|
|
||||||
<div data-testid="member-list">Members: {members.length}</div>
|
|
||||||
),
|
|
||||||
}));
|
|
||||||
|
|
||||||
const mockWorkspace = {
|
|
||||||
id: "ws-test-1",
|
|
||||||
name: "Test Workspace",
|
|
||||||
ownerId: "u1",
|
|
||||||
role: "OWNER",
|
|
||||||
createdAt: "2024-01-01",
|
|
||||||
};
|
|
||||||
|
|
||||||
const mockMembers = [
|
|
||||||
{
|
|
||||||
workspaceId: "ws-test-1",
|
|
||||||
userId: "u1",
|
|
||||||
role: "OWNER",
|
|
||||||
joinedAt: "2024-01-01",
|
|
||||||
user: { id: "u1", email: "a@b.com", name: "Alice", image: null },
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("WorkspaceDetailPage", () => {
|
|
||||||
it("loads and renders member list", async (): Promise<void> => {
|
|
||||||
vi.mocked(workspacesApi.fetchUserWorkspaces).mockResolvedValue([mockWorkspace] as never);
|
|
||||||
vi.mocked(workspacesApi.fetchWorkspaceMembers).mockResolvedValue(mockMembers as never);
|
|
||||||
render(<WorkspaceDetailPage />);
|
|
||||||
await waitFor(() => {
|
|
||||||
expect(screen.getByTestId("member-list")).toBeInTheDocument();
|
|
||||||
});
|
|
||||||
expect(screen.getByText("Test Workspace")).toBeInTheDocument();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("shows error state on fetch failure, not member list", async (): Promise<void> => {
|
|
||||||
vi.mocked(workspacesApi.fetchUserWorkspaces).mockRejectedValue(new Error("Network error"));
|
|
||||||
vi.mocked(workspacesApi.fetchWorkspaceMembers).mockRejectedValue(new Error("Network error"));
|
|
||||||
render(<WorkspaceDetailPage />);
|
|
||||||
await waitFor(() => {
|
|
||||||
expect(screen.getByRole("alert")).toBeInTheDocument();
|
|
||||||
});
|
|
||||||
expect(screen.queryByTestId("member-list")).not.toBeInTheDocument();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,38 +1,42 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useCallback, useEffect, useState } from "react";
|
import { useState } from "react";
|
||||||
import { useParams } from "next/navigation";
|
import { useRouter } from "next/navigation";
|
||||||
import Link from "next/link";
|
import { WorkspaceSettings } from "@/components/workspace/WorkspaceSettings";
|
||||||
import { MemberList } from "@/components/workspace/MemberList";
|
import { MemberList } from "@/components/workspace/MemberList";
|
||||||
import { useAuth } from "@/lib/auth/auth-context";
|
import { InviteMember } from "@/components/workspace/InviteMember";
|
||||||
import { WorkspaceMemberRole } from "@mosaic/shared";
|
import { WorkspaceMemberRole } from "@mosaic/shared";
|
||||||
import {
|
import type { Workspace, WorkspaceMemberWithUser } from "@mosaic/shared";
|
||||||
fetchWorkspaceMembers,
|
import Link from "next/link";
|
||||||
fetchUserWorkspaces,
|
|
||||||
updateWorkspaceMemberRole,
|
|
||||||
removeWorkspaceMember,
|
|
||||||
type WorkspaceMemberEntry,
|
|
||||||
type UserWorkspace,
|
|
||||||
} from "@/lib/api/workspaces";
|
|
||||||
import type { WorkspaceMemberWithUser } from "@/components/workspace/MemberList";
|
|
||||||
|
|
||||||
function getErrorMessage(error: unknown, fallback: string): string {
|
interface WorkspaceDetailPageProps {
|
||||||
if (error instanceof Error) return error.message;
|
params: {
|
||||||
return fallback;
|
id: string;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function toMemberWithUser(m: WorkspaceMemberEntry): WorkspaceMemberWithUser {
|
// Mock data - TODO: Replace with real API calls
|
||||||
return {
|
const mockWorkspace: Workspace = {
|
||||||
workspaceId: m.workspaceId,
|
id: "ws-1",
|
||||||
userId: m.userId,
|
name: "Personal Workspace",
|
||||||
role: m.role,
|
ownerId: "user-1",
|
||||||
joinedAt: new Date(m.joinedAt),
|
settings: {},
|
||||||
|
createdAt: new Date("2024-01-15"),
|
||||||
|
updatedAt: new Date("2024-01-15"),
|
||||||
|
};
|
||||||
|
|
||||||
|
const mockMembers: WorkspaceMemberWithUser[] = [
|
||||||
|
{
|
||||||
|
workspaceId: "ws-1",
|
||||||
|
userId: "user-1",
|
||||||
|
role: WorkspaceMemberRole.OWNER,
|
||||||
|
joinedAt: new Date("2024-01-15"),
|
||||||
user: {
|
user: {
|
||||||
id: m.user.id,
|
id: "user-1",
|
||||||
email: m.user.email,
|
email: "owner@example.com",
|
||||||
name: m.user.name ?? "",
|
name: "John Doe",
|
||||||
image: m.user.image,
|
|
||||||
emailVerified: true,
|
emailVerified: true,
|
||||||
|
image: null,
|
||||||
authProviderId: null,
|
authProviderId: null,
|
||||||
preferences: {},
|
preferences: {},
|
||||||
deactivatedAt: null,
|
deactivatedAt: null,
|
||||||
@@ -41,108 +45,151 @@ function toMemberWithUser(m: WorkspaceMemberEntry): WorkspaceMemberWithUser {
|
|||||||
invitedBy: null,
|
invitedBy: null,
|
||||||
invitationToken: null,
|
invitationToken: null,
|
||||||
invitedAt: null,
|
invitedAt: null,
|
||||||
createdAt: new Date(),
|
createdAt: new Date("2024-01-15"),
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date("2024-01-15"),
|
||||||
},
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
workspaceId: "ws-1",
|
||||||
|
userId: "user-2",
|
||||||
|
role: WorkspaceMemberRole.ADMIN,
|
||||||
|
joinedAt: new Date("2024-01-16"),
|
||||||
|
user: {
|
||||||
|
id: "user-2",
|
||||||
|
email: "admin@example.com",
|
||||||
|
name: "Jane Smith",
|
||||||
|
emailVerified: true,
|
||||||
|
image: null,
|
||||||
|
authProviderId: null,
|
||||||
|
preferences: {},
|
||||||
|
deactivatedAt: null,
|
||||||
|
isLocalAuth: false,
|
||||||
|
passwordHash: null,
|
||||||
|
invitedBy: null,
|
||||||
|
invitationToken: null,
|
||||||
|
invitedAt: null,
|
||||||
|
createdAt: new Date("2024-01-16"),
|
||||||
|
updatedAt: new Date("2024-01-16"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
workspaceId: "ws-1",
|
||||||
|
userId: "user-3",
|
||||||
|
role: WorkspaceMemberRole.MEMBER,
|
||||||
|
joinedAt: new Date("2024-01-17"),
|
||||||
|
user: {
|
||||||
|
id: "user-3",
|
||||||
|
email: "member@example.com",
|
||||||
|
name: "Bob Johnson",
|
||||||
|
emailVerified: true,
|
||||||
|
image: null,
|
||||||
|
authProviderId: null,
|
||||||
|
preferences: {},
|
||||||
|
deactivatedAt: null,
|
||||||
|
isLocalAuth: false,
|
||||||
|
passwordHash: null,
|
||||||
|
invitedBy: null,
|
||||||
|
invitationToken: null,
|
||||||
|
invitedAt: null,
|
||||||
|
createdAt: new Date("2024-01-17"),
|
||||||
|
updatedAt: new Date("2024-01-17"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
export default function WorkspaceDetailPage({
|
||||||
|
params,
|
||||||
|
}: WorkspaceDetailPageProps): React.JSX.Element {
|
||||||
|
const router = useRouter();
|
||||||
|
const [workspace, setWorkspace] = useState<Workspace>(mockWorkspace);
|
||||||
|
const [members, setMembers] = useState<WorkspaceMemberWithUser[]>(mockMembers);
|
||||||
|
const currentUserId = "user-1"; // TODO: Get from auth context
|
||||||
|
const currentUserRole: WorkspaceMemberRole = WorkspaceMemberRole.OWNER; // TODO: Get from API
|
||||||
|
|
||||||
|
// TODO: Replace with actual role check when API is implemented
|
||||||
|
// Currently hardcoded to OWNER in mock data (line 89)
|
||||||
|
const canInvite =
|
||||||
|
currentUserRole === WorkspaceMemberRole.OWNER || currentUserRole === WorkspaceMemberRole.ADMIN;
|
||||||
|
|
||||||
|
const handleUpdateWorkspace = async (name: string): Promise<void> => {
|
||||||
|
// TODO: Replace with real API call
|
||||||
|
console.log("Updating workspace:", { id: params.id, name });
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
||||||
|
setWorkspace({ ...workspace, name, updatedAt: new Date() });
|
||||||
};
|
};
|
||||||
}
|
|
||||||
|
|
||||||
export default function WorkspaceDetailPage(): React.ReactElement {
|
const handleDeleteWorkspace = async (): Promise<void> => {
|
||||||
const params = useParams<{ id: string }>();
|
// TODO: Replace with real API call
|
||||||
const workspaceId = params.id;
|
console.log("Deleting workspace:", params.id);
|
||||||
const { user: authUser } = useAuth();
|
await new Promise((resolve) => setTimeout(resolve, 1000));
|
||||||
|
router.push("/settings/workspaces");
|
||||||
|
};
|
||||||
|
|
||||||
const [workspace, setWorkspace] = useState<UserWorkspace | null>(null);
|
const handleRoleChange = async (userId: string, newRole: WorkspaceMemberRole): Promise<void> => {
|
||||||
const [members, setMembers] = useState<WorkspaceMemberEntry[]>([]);
|
// TODO: Replace with real API call
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
console.log("Changing role:", { userId, newRole });
|
||||||
const [error, setError] = useState<string | null>(null);
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
||||||
|
setMembers(
|
||||||
const load = useCallback(async (): Promise<void> => {
|
members.map((member) => (member.userId === userId ? { ...member, role: newRole } : member))
|
||||||
setIsLoading(true);
|
|
||||||
setError(null);
|
|
||||||
try {
|
|
||||||
const [workspaces, memberList] = await Promise.all([
|
|
||||||
fetchUserWorkspaces(),
|
|
||||||
fetchWorkspaceMembers(workspaceId),
|
|
||||||
]);
|
|
||||||
const ws = workspaces.find((w) => w.id === workspaceId) ?? null;
|
|
||||||
setWorkspace(ws);
|
|
||||||
setMembers(memberList);
|
|
||||||
} catch (err) {
|
|
||||||
setError(getErrorMessage(err, "Failed to load workspace"));
|
|
||||||
} finally {
|
|
||||||
setIsLoading(false);
|
|
||||||
}
|
|
||||||
}, [workspaceId]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
void load();
|
|
||||||
}, [load]);
|
|
||||||
|
|
||||||
const handleRoleChange = useCallback(
|
|
||||||
async (userId: string, newRole: WorkspaceMemberRole): Promise<void> => {
|
|
||||||
await updateWorkspaceMemberRole(workspaceId, userId, { role: newRole });
|
|
||||||
await load();
|
|
||||||
},
|
|
||||||
[workspaceId, load]
|
|
||||||
);
|
|
||||||
|
|
||||||
const handleRemove = useCallback(
|
|
||||||
async (userId: string): Promise<void> => {
|
|
||||||
await removeWorkspaceMember(workspaceId, userId);
|
|
||||||
await load();
|
|
||||||
},
|
|
||||||
[workspaceId, load]
|
|
||||||
);
|
|
||||||
|
|
||||||
if (isLoading) {
|
|
||||||
return (
|
|
||||||
<div className="p-8 text-center text-gray-500" role="status" aria-label="Loading workspace">
|
|
||||||
Loading workspace…
|
|
||||||
</div>
|
|
||||||
);
|
);
|
||||||
}
|
};
|
||||||
|
|
||||||
if (error) {
|
const handleRemoveMember = async (userId: string): Promise<void> => {
|
||||||
return (
|
// TODO: Replace with real API call
|
||||||
<div className="p-8">
|
console.log("Removing member:", userId);
|
||||||
<div className="rounded-lg border border-red-200 bg-red-50 p-4 text-red-700" role="alert">
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
||||||
<p className="font-medium">Failed to load workspace</p>
|
setMembers(members.filter((member) => member.userId !== userId));
|
||||||
<p className="mt-1 text-sm">Please try again later.</p>
|
};
|
||||||
</div>
|
|
||||||
<Link
|
|
||||||
href="/settings/workspaces"
|
|
||||||
className="mt-4 inline-block text-sm text-blue-600 hover:underline"
|
|
||||||
>
|
|
||||||
← Back to Workspaces
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const currentUserId = authUser?.id ?? "";
|
const handleInviteMember = async (email: string, role: WorkspaceMemberRole): Promise<void> => {
|
||||||
const currentMember = members.find((m) => m.userId === currentUserId);
|
// TODO: Replace with real API call
|
||||||
const currentUserRole = currentMember?.role ?? workspace?.role ?? WorkspaceMemberRole.MEMBER;
|
console.log("Inviting member:", { email, role, workspaceId: params.id });
|
||||||
const ownerId =
|
await new Promise((resolve) => setTimeout(resolve, 1000));
|
||||||
members.find((m) => m.role === WorkspaceMemberRole.OWNER)?.userId ?? workspace?.ownerId ?? "";
|
// In real implementation, this would send an invitation email
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="p-8 max-w-3xl">
|
<main className="container mx-auto px-4 py-8 max-w-5xl">
|
||||||
<div className="mb-6">
|
<div className="mb-8">
|
||||||
<Link href="/settings/workspaces" className="text-sm text-gray-500 hover:text-gray-700">
|
<div className="flex items-center justify-between mb-2">
|
||||||
← Back to Workspaces
|
<h1 className="text-3xl font-bold text-gray-900">{workspace.name}</h1>
|
||||||
</Link>
|
<Link href="/settings/workspaces" className="text-sm text-blue-600 hover:text-blue-700">
|
||||||
<h1 className="mt-2 text-2xl font-bold text-gray-900">{workspace?.name ?? "Workspace"}</h1>
|
← Back to Workspaces
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
<p className="text-gray-600">Manage workspace settings and team members</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<MemberList
|
<div className="space-y-6">
|
||||||
members={members.map(toMemberWithUser)}
|
{/* Workspace Settings */}
|
||||||
currentUserId={currentUserId}
|
<WorkspaceSettings
|
||||||
currentUserRole={currentUserRole}
|
workspace={workspace}
|
||||||
workspaceOwnerId={ownerId}
|
userRole={currentUserRole}
|
||||||
onRoleChange={handleRoleChange}
|
onUpdate={handleUpdateWorkspace}
|
||||||
onRemove={handleRemove}
|
onDelete={handleDeleteWorkspace}
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
|
{/* Members Section */}
|
||||||
|
<div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
|
||||||
|
<div className="lg:col-span-2">
|
||||||
|
<MemberList
|
||||||
|
members={members}
|
||||||
|
currentUserId={currentUserId}
|
||||||
|
currentUserRole={currentUserRole}
|
||||||
|
workspaceOwnerId={workspace.ownerId}
|
||||||
|
onRoleChange={handleRoleChange}
|
||||||
|
onRemove={handleRemoveMember}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Invite Member */}
|
||||||
|
{canInvite && (
|
||||||
|
<div className="lg:col-span-2">
|
||||||
|
<InviteMember onInvite={handleInviteMember} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,135 +1,60 @@
|
|||||||
import type { UserWorkspace } from "@/lib/api/workspaces";
|
/**
|
||||||
import type { ReactElement, ReactNode } from "react";
|
* Workspaces Page Tests
|
||||||
|
* Tests for page structure and component integration
|
||||||
|
*/
|
||||||
|
|
||||||
import { WorkspaceMemberRole } from "@mosaic/shared";
|
import { describe, it, expect, vi } from "vitest";
|
||||||
import { render, screen, waitFor } from "@testing-library/react";
|
import { render, screen } from "@testing-library/react";
|
||||||
import userEvent from "@testing-library/user-event";
|
|
||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
||||||
import { createWorkspace, fetchUserWorkspaces } from "@/lib/api/workspaces";
|
|
||||||
|
|
||||||
import WorkspacesPage from "./page";
|
|
||||||
|
|
||||||
|
// Mock next/link
|
||||||
vi.mock("next/link", () => ({
|
vi.mock("next/link", () => ({
|
||||||
default: function LinkMock({
|
default: ({ children, href }: { children: React.ReactNode; href: string }): React.JSX.Element => (
|
||||||
children,
|
<a href={href}>{children}</a>
|
||||||
href,
|
),
|
||||||
}: {
|
|
||||||
children: ReactNode;
|
|
||||||
href: string;
|
|
||||||
}): ReactElement {
|
|
||||||
return <a href={href}>{children}</a>;
|
|
||||||
},
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
// Mock the WorkspaceCard component
|
||||||
vi.mock("@/components/workspace/WorkspaceCard", () => ({
|
vi.mock("@/components/workspace/WorkspaceCard", () => ({
|
||||||
WorkspaceCard: function WorkspaceCardMock({
|
WorkspaceCard: (): React.JSX.Element => <div data-testid="workspace-card">WorkspaceCard</div>,
|
||||||
workspace,
|
|
||||||
userRole,
|
|
||||||
memberCount,
|
|
||||||
}: {
|
|
||||||
workspace: { name: string };
|
|
||||||
userRole: WorkspaceMemberRole;
|
|
||||||
memberCount: number;
|
|
||||||
}): ReactElement {
|
|
||||||
return (
|
|
||||||
<div data-testid="workspace-card">
|
|
||||||
{workspace.name} | {userRole} | {String(memberCount)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("@/lib/api/workspaces", () => ({
|
describe("WorkspacesPage", (): void => {
|
||||||
fetchUserWorkspaces: vi.fn(),
|
// Note: NODE_ENV is "test" during test runs, which triggers the Coming Soon view
|
||||||
createWorkspace: vi.fn(),
|
// This tests the production-like behavior where mock data is hidden
|
||||||
}));
|
|
||||||
|
|
||||||
const fetchUserWorkspacesMock = vi.mocked(fetchUserWorkspaces);
|
|
||||||
const createWorkspaceMock = vi.mocked(createWorkspace);
|
|
||||||
|
|
||||||
const baseWorkspace: UserWorkspace = {
|
|
||||||
id: "workspace-1",
|
|
||||||
name: "Personal Workspace",
|
|
||||||
ownerId: "owner-1",
|
|
||||||
role: WorkspaceMemberRole.OWNER,
|
|
||||||
createdAt: "2026-01-01T00:00:00.000Z",
|
|
||||||
};
|
|
||||||
|
|
||||||
describe("WorkspacesPage", () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("loads and renders user workspaces from the API", async () => {
|
|
||||||
fetchUserWorkspacesMock.mockResolvedValue([baseWorkspace]);
|
|
||||||
|
|
||||||
|
it("should render the Coming Soon view in non-development environments", async (): Promise<void> => {
|
||||||
|
const { default: WorkspacesPage } = await import("./page");
|
||||||
render(<WorkspacesPage />);
|
render(<WorkspacesPage />);
|
||||||
|
|
||||||
expect(screen.getByText("Loading workspaces...")).toBeInTheDocument();
|
// In test mode (non-development), should show Coming Soon
|
||||||
|
expect(screen.getByText("Coming Soon")).toBeInTheDocument();
|
||||||
expect(await screen.findByText("Your Workspaces (1)")).toBeInTheDocument();
|
expect(screen.getByText("Workspace Management")).toBeInTheDocument();
|
||||||
expect(screen.getByTestId("workspace-card")).toHaveTextContent("Personal Workspace");
|
|
||||||
expect(fetchUserWorkspacesMock).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("shows fetch errors in the UI", async () => {
|
it("should display appropriate description for workspace feature", async (): Promise<void> => {
|
||||||
fetchUserWorkspacesMock.mockRejectedValue(new Error("Unable to load workspaces"));
|
const { default: WorkspacesPage } = await import("./page");
|
||||||
|
|
||||||
render(<WorkspacesPage />);
|
render(<WorkspacesPage />);
|
||||||
|
|
||||||
expect(await screen.findByText("Unable to load workspaces")).toBeInTheDocument();
|
expect(
|
||||||
|
screen.getByText(/create and manage workspaces to organize your projects/i)
|
||||||
|
).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("creates a workspace and refreshes the list", async () => {
|
it("should not render mock workspace data in Coming Soon view", async (): Promise<void> => {
|
||||||
fetchUserWorkspacesMock.mockResolvedValueOnce([baseWorkspace]).mockResolvedValueOnce([
|
const { default: WorkspacesPage } = await import("./page");
|
||||||
baseWorkspace,
|
|
||||||
{
|
|
||||||
...baseWorkspace,
|
|
||||||
id: "workspace-2",
|
|
||||||
name: "New Workspace",
|
|
||||||
role: WorkspaceMemberRole.MEMBER,
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
createWorkspaceMock.mockResolvedValue({
|
|
||||||
id: "workspace-2",
|
|
||||||
name: "New Workspace",
|
|
||||||
ownerId: "owner-1",
|
|
||||||
settings: {},
|
|
||||||
createdAt: "2026-01-02T00:00:00.000Z",
|
|
||||||
updatedAt: "2026-01-02T00:00:00.000Z",
|
|
||||||
memberCount: 1,
|
|
||||||
});
|
|
||||||
|
|
||||||
const user = userEvent.setup();
|
|
||||||
render(<WorkspacesPage />);
|
render(<WorkspacesPage />);
|
||||||
|
|
||||||
expect(await screen.findByText("Your Workspaces (1)")).toBeInTheDocument();
|
// Should not show workspace cards or create form in non-development mode
|
||||||
|
expect(screen.queryByTestId("workspace-card")).not.toBeInTheDocument();
|
||||||
await user.type(screen.getByPlaceholderText("Enter workspace name..."), "New Workspace");
|
expect(screen.queryByText("Create New Workspace")).not.toBeInTheDocument();
|
||||||
await user.click(screen.getByRole("button", { name: "Create Workspace" }));
|
|
||||||
|
|
||||||
await waitFor(() => {
|
|
||||||
expect(createWorkspaceMock).toHaveBeenCalledWith({ name: "New Workspace" });
|
|
||||||
});
|
|
||||||
await waitFor(() => {
|
|
||||||
expect(fetchUserWorkspacesMock).toHaveBeenCalledTimes(2);
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(await screen.findByText("Your Workspaces (2)")).toBeInTheDocument();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("shows create errors in the UI", async () => {
|
it("should include link back to settings", async (): Promise<void> => {
|
||||||
fetchUserWorkspacesMock.mockResolvedValue([baseWorkspace]);
|
const { default: WorkspacesPage } = await import("./page");
|
||||||
createWorkspaceMock.mockRejectedValue(new Error("Workspace creation failed"));
|
|
||||||
|
|
||||||
const user = userEvent.setup();
|
|
||||||
render(<WorkspacesPage />);
|
render(<WorkspacesPage />);
|
||||||
|
|
||||||
expect(await screen.findByText("Your Workspaces (1)")).toBeInTheDocument();
|
const link = screen.getByRole("link", { name: /back to settings/i });
|
||||||
|
expect(link).toBeInTheDocument();
|
||||||
await user.type(screen.getByPlaceholderText("Enter workspace name..."), "Bad Workspace");
|
expect(link).toHaveAttribute("href", "/settings");
|
||||||
await user.click(screen.getByRole("button", { name: "Create Workspace" }));
|
|
||||||
|
|
||||||
expect(await screen.findByText("Workspace creation failed")).toBeInTheDocument();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,74 +1,72 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import type { ReactElement, SyntheticEvent } from "react";
|
import type { ReactElement } from "react";
|
||||||
|
|
||||||
import { useCallback, useEffect, useState } from "react";
|
import { useState } from "react";
|
||||||
import { WorkspaceCard } from "@/components/workspace/WorkspaceCard";
|
import { WorkspaceCard } from "@/components/workspace/WorkspaceCard";
|
||||||
import { createWorkspace, fetchUserWorkspaces, type UserWorkspace } from "@/lib/api/workspaces";
|
import { ComingSoon } from "@/components/ui/ComingSoon";
|
||||||
|
import { WorkspaceMemberRole } from "@mosaic/shared";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
|
||||||
function getErrorMessage(error: unknown, fallback: string): string {
|
// Check if we're in development mode
|
||||||
if (error instanceof Error) {
|
const isDevelopment = process.env.NODE_ENV === "development";
|
||||||
return error.message;
|
|
||||||
}
|
|
||||||
|
|
||||||
return fallback;
|
// Mock data - TODO: Replace with real API calls (development only)
|
||||||
}
|
const mockWorkspaces = [
|
||||||
|
{
|
||||||
|
id: "ws-1",
|
||||||
|
name: "Personal Workspace",
|
||||||
|
ownerId: "user-1",
|
||||||
|
settings: {},
|
||||||
|
createdAt: new Date("2024-01-15"),
|
||||||
|
updatedAt: new Date("2024-01-15"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "ws-2",
|
||||||
|
name: "Team Alpha",
|
||||||
|
ownerId: "user-2",
|
||||||
|
settings: {},
|
||||||
|
createdAt: new Date("2024-01-20"),
|
||||||
|
updatedAt: new Date("2024-01-20"),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const mockMemberships = [
|
||||||
|
{ workspaceId: "ws-1", role: WorkspaceMemberRole.OWNER, memberCount: 1 },
|
||||||
|
{ workspaceId: "ws-2", role: WorkspaceMemberRole.MEMBER, memberCount: 5 },
|
||||||
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Workspaces Page
|
* Workspaces Page Content - Development Only
|
||||||
* Fetches and creates workspaces through the real API.
|
* Shows mock workspace data for development purposes
|
||||||
*/
|
*/
|
||||||
export default function WorkspacesPage(): ReactElement {
|
function WorkspacesPageContent(): ReactElement {
|
||||||
const [workspaces, setWorkspaces] = useState<UserWorkspace[]>([]);
|
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
|
||||||
const [loadError, setLoadError] = useState<string | null>(null);
|
|
||||||
const [isCreating, setIsCreating] = useState(false);
|
const [isCreating, setIsCreating] = useState(false);
|
||||||
const [newWorkspaceName, setNewWorkspaceName] = useState("");
|
const [newWorkspaceName, setNewWorkspaceName] = useState("");
|
||||||
const [createError, setCreateError] = useState<string | null>(null);
|
|
||||||
|
|
||||||
const loadWorkspaces = useCallback(async (): Promise<void> => {
|
// TODO: Replace with real API call
|
||||||
setIsLoading(true);
|
const workspacesWithRoles = mockWorkspaces.map((workspace) => {
|
||||||
|
const membership = mockMemberships.find((m) => m.workspaceId === workspace.id);
|
||||||
|
return {
|
||||||
|
...workspace,
|
||||||
|
userRole: membership?.role ?? WorkspaceMemberRole.GUEST,
|
||||||
|
memberCount: membership?.memberCount ?? 0,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
try {
|
const handleCreateWorkspace = async (e: React.SyntheticEvent<HTMLFormElement>): Promise<void> => {
|
||||||
const data = await fetchUserWorkspaces();
|
|
||||||
setWorkspaces(data);
|
|
||||||
setLoadError(null);
|
|
||||||
} catch (error) {
|
|
||||||
setLoadError(getErrorMessage(error, "Failed to load workspaces"));
|
|
||||||
} finally {
|
|
||||||
setIsLoading(false);
|
|
||||||
}
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
void loadWorkspaces();
|
|
||||||
}, [loadWorkspaces]);
|
|
||||||
|
|
||||||
const workspacesWithRoles = workspaces.map((workspace) => ({
|
|
||||||
...workspace,
|
|
||||||
settings: {},
|
|
||||||
createdAt: new Date(workspace.createdAt),
|
|
||||||
updatedAt: new Date(workspace.createdAt),
|
|
||||||
userRole: workspace.role,
|
|
||||||
memberCount: 1,
|
|
||||||
}));
|
|
||||||
|
|
||||||
const handleCreateWorkspace = async (e: SyntheticEvent<HTMLFormElement>): Promise<void> => {
|
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
if (!newWorkspaceName.trim()) return;
|
||||||
const workspaceName = newWorkspaceName.trim();
|
|
||||||
if (!workspaceName) return;
|
|
||||||
|
|
||||||
setIsCreating(true);
|
setIsCreating(true);
|
||||||
setCreateError(null);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await createWorkspace({ name: workspaceName });
|
// TODO: Replace with real API call
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 1000)); // Simulate API call
|
||||||
|
alert(`Workspace "${newWorkspaceName}" created successfully!`);
|
||||||
setNewWorkspaceName("");
|
setNewWorkspaceName("");
|
||||||
await loadWorkspaces();
|
} catch (_error) {
|
||||||
} catch (error) {
|
console.error("Failed to create workspace:", _error);
|
||||||
setCreateError(getErrorMessage(error, "Failed to create workspace"));
|
alert("Failed to create workspace");
|
||||||
} finally {
|
} finally {
|
||||||
setIsCreating(false);
|
setIsCreating(false);
|
||||||
}
|
}
|
||||||
@@ -108,27 +106,14 @@ export default function WorkspacesPage(): ReactElement {
|
|||||||
{isCreating ? "Creating..." : "Create Workspace"}
|
{isCreating ? "Creating..." : "Create Workspace"}
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
{createError !== null && (
|
|
||||||
<div className="mt-3 rounded-md border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">
|
|
||||||
{createError}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Workspace List */}
|
{/* Workspace List */}
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
<h2 className="text-xl font-semibold text-gray-900">
|
<h2 className="text-xl font-semibold text-gray-900">
|
||||||
Your Workspaces ({isLoading ? "..." : workspacesWithRoles.length})
|
Your Workspaces ({workspacesWithRoles.length})
|
||||||
</h2>
|
</h2>
|
||||||
{loadError !== null ? (
|
{workspacesWithRoles.length === 0 ? (
|
||||||
<div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-red-700">
|
|
||||||
{loadError}
|
|
||||||
</div>
|
|
||||||
) : isLoading ? (
|
|
||||||
<div className="bg-white rounded-lg shadow-sm border border-gray-200 p-12 text-center text-gray-600">
|
|
||||||
Loading workspaces...
|
|
||||||
</div>
|
|
||||||
) : workspacesWithRoles.length === 0 ? (
|
|
||||||
<div className="bg-white rounded-lg shadow-sm border border-gray-200 p-12 text-center">
|
<div className="bg-white rounded-lg shadow-sm border border-gray-200 p-12 text-center">
|
||||||
<svg
|
<svg
|
||||||
className="mx-auto h-12 w-12 text-gray-400 mb-4"
|
className="mx-auto h-12 w-12 text-gray-400 mb-4"
|
||||||
@@ -162,3 +147,26 @@ export default function WorkspacesPage(): ReactElement {
|
|||||||
</main>
|
</main>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Workspaces Page Entry Point
|
||||||
|
* Shows development content or Coming Soon based on environment
|
||||||
|
*/
|
||||||
|
export default function WorkspacesPage(): ReactElement {
|
||||||
|
// In production, show Coming Soon placeholder
|
||||||
|
if (!isDevelopment) {
|
||||||
|
return (
|
||||||
|
<ComingSoon
|
||||||
|
feature="Workspace Management"
|
||||||
|
description="Create and manage workspaces to organize your projects and collaborate with your team. This feature is currently under development."
|
||||||
|
>
|
||||||
|
<Link href="/settings" className="text-sm text-blue-600 hover:text-blue-700">
|
||||||
|
Back to Settings
|
||||||
|
</Link>
|
||||||
|
</ComingSoon>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// In development, show the full page with mock data
|
||||||
|
return <WorkspacesPageContent />;
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,25 +2,136 @@
|
|||||||
|
|
||||||
import type { ReactElement } from "react";
|
import type { ReactElement } from "react";
|
||||||
|
|
||||||
import { useParams } from "next/navigation";
|
import { useState } from "react";
|
||||||
import { ComingSoon } from "@/components/ui/ComingSoon";
|
import { useParams, useRouter } from "next/navigation";
|
||||||
|
import { TeamSettings } from "@/components/team/TeamSettings";
|
||||||
|
import { TeamMemberList } from "@/components/team/TeamMemberList";
|
||||||
|
import { mockTeamWithMembers } from "@/lib/api/teams";
|
||||||
|
import type { User } from "@mosaic/shared";
|
||||||
|
import type { TeamMemberRole } from "@mosaic/shared";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
|
||||||
|
// Mock available users for adding to team
|
||||||
|
const mockAvailableUsers: User[] = [
|
||||||
|
{
|
||||||
|
id: "user-3",
|
||||||
|
email: "alice@example.com",
|
||||||
|
name: "Alice Johnson",
|
||||||
|
emailVerified: true,
|
||||||
|
image: null,
|
||||||
|
authProviderId: null,
|
||||||
|
preferences: {},
|
||||||
|
deactivatedAt: null,
|
||||||
|
isLocalAuth: false,
|
||||||
|
passwordHash: null,
|
||||||
|
invitedBy: null,
|
||||||
|
invitationToken: null,
|
||||||
|
invitedAt: null,
|
||||||
|
createdAt: new Date("2026-01-17"),
|
||||||
|
updatedAt: new Date("2026-01-17"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "user-4",
|
||||||
|
email: "bob@example.com",
|
||||||
|
name: "Bob Wilson",
|
||||||
|
emailVerified: true,
|
||||||
|
image: null,
|
||||||
|
authProviderId: null,
|
||||||
|
preferences: {},
|
||||||
|
deactivatedAt: null,
|
||||||
|
isLocalAuth: false,
|
||||||
|
passwordHash: null,
|
||||||
|
invitedBy: null,
|
||||||
|
invitationToken: null,
|
||||||
|
invitedAt: null,
|
||||||
|
createdAt: new Date("2026-01-18"),
|
||||||
|
updatedAt: new Date("2026-01-18"),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
export default function TeamDetailPage(): ReactElement {
|
export default function TeamDetailPage(): ReactElement {
|
||||||
const params = useParams();
|
const params = useParams();
|
||||||
|
const router = useRouter();
|
||||||
const workspaceId = params.id as string;
|
const workspaceId = params.id as string;
|
||||||
|
// const teamId = params.teamId as string; // Will be used for API calls
|
||||||
|
|
||||||
|
// TODO: Replace with real API call when backend is ready
|
||||||
|
// const { data: team, isLoading } = useQuery({
|
||||||
|
// queryKey: ["team", workspaceId, params.teamId],
|
||||||
|
// queryFn: () => fetchTeam(workspaceId, params.teamId as string),
|
||||||
|
// });
|
||||||
|
|
||||||
|
const [team] = useState(mockTeamWithMembers);
|
||||||
|
const [isLoading] = useState(false);
|
||||||
|
|
||||||
|
const handleUpdateTeam = (data: { name?: string; description?: string }): Promise<void> => {
|
||||||
|
// TODO: Replace with real API call
|
||||||
|
// await updateTeam(workspaceId, teamId, data);
|
||||||
|
console.log("Updating team:", data);
|
||||||
|
// TODO: Refetch team data
|
||||||
|
return Promise.resolve();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDeleteTeam = (): Promise<void> => {
|
||||||
|
// TODO: Replace with real API call
|
||||||
|
// await deleteTeam(workspaceId, teamId);
|
||||||
|
console.log("Deleting team");
|
||||||
|
|
||||||
|
// Navigate back to teams list
|
||||||
|
router.push(`/settings/workspaces/${workspaceId}/teams`);
|
||||||
|
return Promise.resolve();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleAddMember = (userId: string, role?: TeamMemberRole): Promise<void> => {
|
||||||
|
// TODO: Replace with real API call
|
||||||
|
// await addTeamMember(workspaceId, teamId, { userId, role });
|
||||||
|
console.log("Adding member:", { userId, role });
|
||||||
|
// TODO: Refetch team data
|
||||||
|
return Promise.resolve();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleRemoveMember = (userId: string): Promise<void> => {
|
||||||
|
// TODO: Replace with real API call
|
||||||
|
// await removeTeamMember(workspaceId, teamId, userId);
|
||||||
|
console.log("Removing member:", userId);
|
||||||
|
// TODO: Refetch team data
|
||||||
|
return Promise.resolve();
|
||||||
|
};
|
||||||
|
|
||||||
|
if (isLoading) {
|
||||||
|
return (
|
||||||
|
<main className="container mx-auto px-4 py-8">
|
||||||
|
<div className="flex justify-center items-center p-8">
|
||||||
|
<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900"></div>
|
||||||
|
<span className="ml-3 text-gray-600">Loading team...</span>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ComingSoon
|
<main className="container mx-auto px-4 py-8">
|
||||||
feature="Team Details"
|
<div className="mb-8">
|
||||||
description="Team member management is being migrated to live API-backed data."
|
<Link
|
||||||
>
|
href={`/settings/workspaces/${workspaceId}/teams`}
|
||||||
<Link
|
className="text-blue-600 hover:text-blue-700 text-sm mb-2 inline-block"
|
||||||
href={`/settings/workspaces/${workspaceId}/teams`}
|
>
|
||||||
className="text-sm text-blue-600 hover:text-blue-700"
|
← Back to Teams
|
||||||
>
|
</Link>
|
||||||
{"<-"} Back to Teams
|
<h1 className="text-3xl font-bold text-gray-900">{team.name}</h1>
|
||||||
</Link>
|
{team.description && <p className="text-gray-600 mt-2">{team.description}</p>}
|
||||||
</ComingSoon>
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-6">
|
||||||
|
<TeamSettings team={team} onUpdate={handleUpdateTeam} onDelete={handleDeleteTeam} />
|
||||||
|
|
||||||
|
<TeamMemberList
|
||||||
|
members={team.members}
|
||||||
|
onAddMember={handleAddMember}
|
||||||
|
onRemoveMember={handleRemoveMember}
|
||||||
|
availableUsers={mockAvailableUsers}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,90 +2,63 @@
|
|||||||
|
|
||||||
import type { ReactElement } from "react";
|
import type { ReactElement } from "react";
|
||||||
|
|
||||||
import { useCallback, useEffect, useState } from "react";
|
import { useState } from "react";
|
||||||
import { useParams } from "next/navigation";
|
import { useParams } from "next/navigation";
|
||||||
import { TeamCard } from "@/components/team/TeamCard";
|
import { TeamCard } from "@/components/team/TeamCard";
|
||||||
import { ComingSoon } from "@/components/ui/ComingSoon";
|
import { ComingSoon } from "@/components/ui/ComingSoon";
|
||||||
import { Button, Input, Modal } from "@mosaic/ui";
|
import { Button, Input, Modal } from "@mosaic/ui";
|
||||||
import { createTeam, fetchTeams, type CreateTeamDto, type TeamRecord } from "@/lib/api/teams";
|
import { mockTeams } from "@/lib/api/teams";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
|
||||||
|
// Check if we're in development mode
|
||||||
const isDevelopment = process.env.NODE_ENV === "development";
|
const isDevelopment = process.env.NODE_ENV === "development";
|
||||||
|
|
||||||
function getErrorMessage(error: unknown, fallback: string): string {
|
/**
|
||||||
if (error instanceof Error) {
|
* Teams Page Content - Development Only
|
||||||
return error.message;
|
* Shows mock team data for development purposes
|
||||||
}
|
*/
|
||||||
|
|
||||||
return fallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
function TeamsPageContent(): ReactElement {
|
function TeamsPageContent(): ReactElement {
|
||||||
const params = useParams();
|
const params = useParams();
|
||||||
const workspaceId = params.id as string;
|
const workspaceId = params.id as string;
|
||||||
|
|
||||||
const [teams, setTeams] = useState<TeamRecord[]>([]);
|
// TODO: Replace with real API call when backend is ready
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
// const { data: teams, isLoading } = useQuery({
|
||||||
const [loadError, setLoadError] = useState<string | null>(null);
|
// queryKey: ["teams", workspaceId],
|
||||||
|
// queryFn: () => fetchTeams(workspaceId),
|
||||||
|
// });
|
||||||
|
|
||||||
|
const [teams] = useState(mockTeams);
|
||||||
|
const [isLoading] = useState(false);
|
||||||
const [isCreating, setIsCreating] = useState(false);
|
const [isCreating, setIsCreating] = useState(false);
|
||||||
const [showCreateModal, setShowCreateModal] = useState(false);
|
const [showCreateModal, setShowCreateModal] = useState(false);
|
||||||
const [newTeamName, setNewTeamName] = useState("");
|
const [newTeamName, setNewTeamName] = useState("");
|
||||||
const [newTeamDescription, setNewTeamDescription] = useState("");
|
const [newTeamDescription, setNewTeamDescription] = useState("");
|
||||||
const [createError, setCreateError] = useState<string | null>(null);
|
|
||||||
|
|
||||||
const loadTeams = useCallback(async (): Promise<void> => {
|
const handleCreateTeam = (): void => {
|
||||||
setIsLoading(true);
|
if (!newTeamName.trim()) return;
|
||||||
|
|
||||||
try {
|
|
||||||
const data = await fetchTeams(workspaceId);
|
|
||||||
setTeams(data);
|
|
||||||
setLoadError(null);
|
|
||||||
} catch (error) {
|
|
||||||
setLoadError(getErrorMessage(error, "Failed to load teams"));
|
|
||||||
} finally {
|
|
||||||
setIsLoading(false);
|
|
||||||
}
|
|
||||||
}, [workspaceId]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
void loadTeams();
|
|
||||||
}, [loadTeams]);
|
|
||||||
|
|
||||||
const handleCreateTeam = async (): Promise<void> => {
|
|
||||||
const teamName = newTeamName.trim();
|
|
||||||
if (!teamName) return;
|
|
||||||
|
|
||||||
setIsCreating(true);
|
setIsCreating(true);
|
||||||
setCreateError(null);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const description = newTeamDescription.trim();
|
// TODO: Replace with real API call
|
||||||
const dto: CreateTeamDto = {
|
// await createTeam(workspaceId, {
|
||||||
name: teamName,
|
// name: newTeamName,
|
||||||
};
|
// description: newTeamDescription || undefined,
|
||||||
if (description.length > 0) {
|
// });
|
||||||
dto.description = description;
|
|
||||||
}
|
|
||||||
|
|
||||||
await createTeam(dto, workspaceId);
|
|
||||||
|
|
||||||
|
// Reset form
|
||||||
setNewTeamName("");
|
setNewTeamName("");
|
||||||
setNewTeamDescription("");
|
setNewTeamDescription("");
|
||||||
setShowCreateModal(false);
|
setShowCreateModal(false);
|
||||||
await loadTeams();
|
|
||||||
} catch (error) {
|
// TODO: Refresh teams list
|
||||||
setCreateError(getErrorMessage(error, "Failed to create team"));
|
} catch (_error) {
|
||||||
|
console.error("Failed to create team:", _error);
|
||||||
|
alert("Failed to create team. Please try again.");
|
||||||
} finally {
|
} finally {
|
||||||
setIsCreating(false);
|
setIsCreating(false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const teamsForCards = teams.map((team) => ({
|
|
||||||
...team,
|
|
||||||
createdAt: new Date(team.createdAt),
|
|
||||||
updatedAt: new Date(team.updatedAt),
|
|
||||||
}));
|
|
||||||
|
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
return (
|
return (
|
||||||
<main className="container mx-auto px-4 py-8">
|
<main className="container mx-auto px-4 py-8">
|
||||||
@@ -107,7 +80,6 @@ function TeamsPageContent(): ReactElement {
|
|||||||
<Button
|
<Button
|
||||||
variant="primary"
|
variant="primary"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setCreateError(null);
|
|
||||||
setShowCreateModal(true);
|
setShowCreateModal(true);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -115,11 +87,7 @@ function TeamsPageContent(): ReactElement {
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{loadError !== null ? (
|
{teams.length === 0 ? (
|
||||||
<div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-red-700">
|
|
||||||
{loadError}
|
|
||||||
</div>
|
|
||||||
) : teamsForCards.length === 0 ? (
|
|
||||||
<div className="text-center p-12 bg-gray-50 rounded-lg">
|
<div className="text-center p-12 bg-gray-50 rounded-lg">
|
||||||
<p className="text-lg text-gray-500 mb-4">No teams yet</p>
|
<p className="text-lg text-gray-500 mb-4">No teams yet</p>
|
||||||
<p className="text-sm text-gray-400 mb-6">
|
<p className="text-sm text-gray-400 mb-6">
|
||||||
@@ -128,7 +96,6 @@ function TeamsPageContent(): ReactElement {
|
|||||||
<Button
|
<Button
|
||||||
variant="primary"
|
variant="primary"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setCreateError(null);
|
|
||||||
setShowCreateModal(true);
|
setShowCreateModal(true);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -137,12 +104,13 @@ function TeamsPageContent(): ReactElement {
|
|||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
||||||
{teamsForCards.map((team) => (
|
{teams.map((team) => (
|
||||||
<TeamCard key={team.id} team={team} workspaceId={workspaceId} />
|
<TeamCard key={team.id} team={team} workspaceId={workspaceId} />
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Create Team Modal */}
|
||||||
{showCreateModal && (
|
{showCreateModal && (
|
||||||
<Modal
|
<Modal
|
||||||
isOpen={showCreateModal}
|
isOpen={showCreateModal}
|
||||||
@@ -175,11 +143,6 @@ function TeamsPageContent(): ReactElement {
|
|||||||
fullWidth
|
fullWidth
|
||||||
disabled={isCreating}
|
disabled={isCreating}
|
||||||
/>
|
/>
|
||||||
{createError !== null && (
|
|
||||||
<div className="rounded-md border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">
|
|
||||||
{createError}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="flex gap-2 justify-end pt-4">
|
<div className="flex gap-2 justify-end pt-4">
|
||||||
<Button
|
<Button
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
@@ -192,7 +155,7 @@ function TeamsPageContent(): ReactElement {
|
|||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
variant="primary"
|
variant="primary"
|
||||||
onClick={() => void handleCreateTeam()}
|
onClick={handleCreateTeam}
|
||||||
disabled={!newTeamName.trim() || isCreating}
|
disabled={!newTeamName.trim() || isCreating}
|
||||||
>
|
>
|
||||||
{isCreating ? "Creating..." : "Create Team"}
|
{isCreating ? "Creating..." : "Create Team"}
|
||||||
@@ -205,7 +168,12 @@ function TeamsPageContent(): ReactElement {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Teams Page Entry Point
|
||||||
|
* Shows development content or Coming Soon based on environment
|
||||||
|
*/
|
||||||
export default function TeamsPage(): ReactElement {
|
export default function TeamsPage(): ReactElement {
|
||||||
|
// In production, show Coming Soon placeholder
|
||||||
if (!isDevelopment) {
|
if (!isDevelopment) {
|
||||||
return (
|
return (
|
||||||
<ComingSoon
|
<ComingSoon
|
||||||
@@ -219,5 +187,6 @@ export default function TeamsPage(): ReactElement {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// In development, show the full page with mock data
|
||||||
return <TeamsPageContent />;
|
return <TeamsPageContent />;
|
||||||
}
|
}
|
||||||
|
|||||||
333
apps/web/src/components/admin/InviteUserDialog.tsx
Normal file
333
apps/web/src/components/admin/InviteUserDialog.tsx
Normal file
@@ -0,0 +1,333 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState, type ReactElement, type SyntheticEvent } from "react";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from "@/components/ui/select";
|
||||||
|
import type { InviteUserDto, WorkspaceMemberRole } from "@/lib/api/admin";
|
||||||
|
|
||||||
|
/* ---------------------------------------------------------------------------
|
||||||
|
Types
|
||||||
|
--------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
interface WorkspaceOption {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface InviteUserDialogProps {
|
||||||
|
open: boolean;
|
||||||
|
onOpenChange: (open: boolean) => void;
|
||||||
|
onSubmit: (data: InviteUserDto) => Promise<void>;
|
||||||
|
isSubmitting: boolean;
|
||||||
|
workspaces: WorkspaceOption[];
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------------------------------------------------------------------------
|
||||||
|
Validation
|
||||||
|
--------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
||||||
|
|
||||||
|
function validateEmail(value: string): string | null {
|
||||||
|
const trimmed = value.trim();
|
||||||
|
if (!trimmed) return "Email is required.";
|
||||||
|
if (!EMAIL_REGEX.test(trimmed)) return "Please enter a valid email address.";
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------------------------------------------------------------------------
|
||||||
|
Component
|
||||||
|
--------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
export function InviteUserDialog({
|
||||||
|
open,
|
||||||
|
onOpenChange,
|
||||||
|
onSubmit,
|
||||||
|
isSubmitting,
|
||||||
|
workspaces,
|
||||||
|
}: InviteUserDialogProps): ReactElement | null {
|
||||||
|
const [email, setEmail] = useState("");
|
||||||
|
const [name, setName] = useState("");
|
||||||
|
const [workspaceId, setWorkspaceId] = useState("");
|
||||||
|
const [role, setRole] = useState<WorkspaceMemberRole>("MEMBER");
|
||||||
|
const [formError, setFormError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
function resetForm(): void {
|
||||||
|
setEmail("");
|
||||||
|
setName("");
|
||||||
|
setWorkspaceId("");
|
||||||
|
setRole("MEMBER");
|
||||||
|
setFormError(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleSubmit(e: SyntheticEvent): Promise<void> {
|
||||||
|
e.preventDefault();
|
||||||
|
setFormError(null);
|
||||||
|
|
||||||
|
const emailError = validateEmail(email);
|
||||||
|
if (emailError) {
|
||||||
|
setFormError(emailError);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const dto: InviteUserDto = {
|
||||||
|
email: email.trim(),
|
||||||
|
role,
|
||||||
|
};
|
||||||
|
const trimmedName = name.trim();
|
||||||
|
if (trimmedName) dto.name = trimmedName;
|
||||||
|
if (workspaceId) dto.workspaceId = workspaceId;
|
||||||
|
|
||||||
|
await onSubmit(dto);
|
||||||
|
resetForm();
|
||||||
|
} catch (err: unknown) {
|
||||||
|
setFormError(err instanceof Error ? err.message : "Failed to send invitation.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!open) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
role="dialog"
|
||||||
|
aria-modal="true"
|
||||||
|
aria-labelledby="invite-user-title"
|
||||||
|
style={{
|
||||||
|
position: "fixed",
|
||||||
|
inset: 0,
|
||||||
|
zIndex: 50,
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{/* Backdrop */}
|
||||||
|
<div
|
||||||
|
data-testid="invite-dialog-backdrop"
|
||||||
|
style={{ position: "fixed", inset: 0, background: "rgba(0,0,0,0.5)" }}
|
||||||
|
onClick={() => {
|
||||||
|
if (!isSubmitting) {
|
||||||
|
resetForm();
|
||||||
|
onOpenChange(false);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{/* Dialog */}
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
position: "relative",
|
||||||
|
background: "var(--surface, #fff)",
|
||||||
|
borderRadius: "8px",
|
||||||
|
border: "1px solid var(--border, #e5e7eb)",
|
||||||
|
padding: 24,
|
||||||
|
width: "100%",
|
||||||
|
maxWidth: 480,
|
||||||
|
zIndex: 1,
|
||||||
|
maxHeight: "90vh",
|
||||||
|
overflowY: "auto",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
id="invite-user-title"
|
||||||
|
style={{
|
||||||
|
fontSize: "1.125rem",
|
||||||
|
fontWeight: 600,
|
||||||
|
color: "var(--text, #111)",
|
||||||
|
margin: "0 0 8px",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Invite User
|
||||||
|
</h2>
|
||||||
|
<p style={{ color: "var(--muted, #6b7280)", fontSize: "0.875rem", margin: "0 0 16px" }}>
|
||||||
|
Send an invitation to join the platform.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<form
|
||||||
|
onSubmit={(e) => {
|
||||||
|
void handleSubmit(e);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{/* Email */}
|
||||||
|
<div style={{ marginBottom: 16 }}>
|
||||||
|
<label
|
||||||
|
htmlFor="invite-email"
|
||||||
|
style={{
|
||||||
|
display: "block",
|
||||||
|
marginBottom: 6,
|
||||||
|
fontSize: "0.85rem",
|
||||||
|
fontWeight: 500,
|
||||||
|
color: "var(--text-2, #374151)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Email <span style={{ color: "var(--danger, #ef4444)" }}>*</span>
|
||||||
|
</label>
|
||||||
|
<Input
|
||||||
|
id="invite-email"
|
||||||
|
type="email"
|
||||||
|
value={email}
|
||||||
|
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
|
setEmail(e.target.value);
|
||||||
|
}}
|
||||||
|
placeholder="user@example.com"
|
||||||
|
maxLength={254}
|
||||||
|
autoFocus
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Name */}
|
||||||
|
<div style={{ marginBottom: 16 }}>
|
||||||
|
<label
|
||||||
|
htmlFor="invite-name"
|
||||||
|
style={{
|
||||||
|
display: "block",
|
||||||
|
marginBottom: 6,
|
||||||
|
fontSize: "0.85rem",
|
||||||
|
fontWeight: 500,
|
||||||
|
color: "var(--text-2, #374151)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Name
|
||||||
|
</label>
|
||||||
|
<Input
|
||||||
|
id="invite-name"
|
||||||
|
type="text"
|
||||||
|
value={name}
|
||||||
|
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
|
setName(e.target.value);
|
||||||
|
}}
|
||||||
|
placeholder="Full name (optional)"
|
||||||
|
maxLength={255}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Workspace */}
|
||||||
|
{workspaces.length > 0 && (
|
||||||
|
<div style={{ marginBottom: 16 }}>
|
||||||
|
<label
|
||||||
|
htmlFor="invite-workspace"
|
||||||
|
style={{
|
||||||
|
display: "block",
|
||||||
|
marginBottom: 6,
|
||||||
|
fontSize: "0.85rem",
|
||||||
|
fontWeight: 500,
|
||||||
|
color: "var(--text-2, #374151)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Workspace
|
||||||
|
</label>
|
||||||
|
<Select
|
||||||
|
value={workspaceId}
|
||||||
|
onValueChange={(v) => {
|
||||||
|
setWorkspaceId(v);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<SelectTrigger id="invite-workspace">
|
||||||
|
<SelectValue placeholder="Select a workspace (optional)" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{workspaces.map((ws) => (
|
||||||
|
<SelectItem key={ws.id} value={ws.id}>
|
||||||
|
{ws.name}
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Role */}
|
||||||
|
<div style={{ marginBottom: 16 }}>
|
||||||
|
<label
|
||||||
|
htmlFor="invite-role"
|
||||||
|
style={{
|
||||||
|
display: "block",
|
||||||
|
marginBottom: 6,
|
||||||
|
fontSize: "0.85rem",
|
||||||
|
fontWeight: 500,
|
||||||
|
color: "var(--text-2, #374151)",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Role
|
||||||
|
</label>
|
||||||
|
<Select
|
||||||
|
value={role}
|
||||||
|
onValueChange={(v) => {
|
||||||
|
setRole(v as WorkspaceMemberRole);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<SelectTrigger id="invite-role">
|
||||||
|
<SelectValue placeholder="Select role" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="MEMBER">Member</SelectItem>
|
||||||
|
<SelectItem value="ADMIN">Admin</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Form error */}
|
||||||
|
{formError !== null && (
|
||||||
|
<p
|
||||||
|
role="alert"
|
||||||
|
style={{
|
||||||
|
color: "var(--danger, #ef4444)",
|
||||||
|
fontSize: "0.85rem",
|
||||||
|
margin: "0 0 12px",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{formError}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Buttons */}
|
||||||
|
<div style={{ display: "flex", justifyContent: "flex-end", gap: 8, marginTop: 8 }}>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => {
|
||||||
|
resetForm();
|
||||||
|
onOpenChange(false);
|
||||||
|
}}
|
||||||
|
disabled={isSubmitting}
|
||||||
|
style={{
|
||||||
|
padding: "8px 16px",
|
||||||
|
background: "transparent",
|
||||||
|
border: "1px solid var(--border, #d1d5db)",
|
||||||
|
borderRadius: "6px",
|
||||||
|
color: "var(--text-2, #374151)",
|
||||||
|
fontSize: "0.85rem",
|
||||||
|
cursor: "pointer",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
disabled={isSubmitting || !email.trim()}
|
||||||
|
style={{
|
||||||
|
padding: "8px 16px",
|
||||||
|
background: "var(--primary, #111827)",
|
||||||
|
border: "none",
|
||||||
|
borderRadius: "6px",
|
||||||
|
color: "#fff",
|
||||||
|
fontSize: "0.85rem",
|
||||||
|
fontWeight: 500,
|
||||||
|
cursor: isSubmitting || !email.trim() ? "not-allowed" : "pointer",
|
||||||
|
opacity: isSubmitting || !email.trim() ? 0.6 : 1,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{isSubmitting ? "Sending..." : "Send Invitation"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-unsafe-enum-comparison */
|
|
||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-unnecessary-condition */
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import type { KnowledgeEntryWithTags } from "@mosaic/shared";
|
import type { KnowledgeEntryWithTags } from "@mosaic/shared";
|
||||||
import { EntryStatus } from "@mosaic/shared";
|
import { EntryStatus } from "@mosaic/shared";
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { usePathname } from "next/navigation";
|
import { usePathname } from "next/navigation";
|
||||||
import Image from "next/image";
|
import Image from "next/image";
|
||||||
import { useAuth } from "@/lib/auth/auth-context";
|
import { useAuth } from "@/lib/auth/auth-context";
|
||||||
import { fetchUserWorkspaces } from "@/lib/api/workspaces";
|
|
||||||
import { useSidebar } from "./SidebarContext";
|
import { useSidebar } from "./SidebarContext";
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@@ -463,26 +461,10 @@ interface UserCardProps {
|
|||||||
|
|
||||||
function UserCard({ collapsed }: UserCardProps): React.JSX.Element {
|
function UserCard({ collapsed }: UserCardProps): React.JSX.Element {
|
||||||
const { user } = useAuth();
|
const { user } = useAuth();
|
||||||
const [roleLabel, setRoleLabel] = useState<string>("Member");
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (user === null) return;
|
|
||||||
fetchUserWorkspaces()
|
|
||||||
.then((workspaces) => {
|
|
||||||
if (workspaces.length === 0) return;
|
|
||||||
const first = workspaces[0];
|
|
||||||
if (!first) return;
|
|
||||||
const role = first.role;
|
|
||||||
setRoleLabel(role.charAt(0) + role.slice(1).toLowerCase());
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
// keep default
|
|
||||||
});
|
|
||||||
}, [user]);
|
|
||||||
|
|
||||||
const displayName = user?.name ?? "User";
|
const displayName = user?.name ?? "User";
|
||||||
const initials = getInitials(displayName);
|
const initials = getInitials(displayName);
|
||||||
const role = roleLabel;
|
const role = "Member";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<footer
|
<footer
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-unsafe-enum-comparison */
|
|
||||||
"use client";
|
"use client";
|
||||||
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
||||||
|
|
||||||
|
|||||||
@@ -137,8 +137,7 @@ describe("TaskItem", (): void => {
|
|||||||
dueDate: null,
|
dueDate: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
render(<TaskItem task={taskWithoutDueDate} />);
|
||||||
render(<TaskItem task={taskWithoutDueDate as any} />);
|
|
||||||
expect(screen.getByText("Test task")).toBeInTheDocument();
|
expect(screen.getByText("Test task")).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-unnecessary-condition */
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import type { Task } from "@mosaic/shared";
|
import type { Task } from "@mosaic/shared";
|
||||||
import { TaskStatus, TaskPriority } from "@mosaic/shared";
|
import { TaskStatus, TaskPriority } from "@mosaic/shared";
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
|
||||||
import * as client from "./client";
|
|
||||||
import { fetchAdminUsers, inviteUser, updateUser, deactivateUser } from "./admin";
|
|
||||||
|
|
||||||
vi.mock("./client");
|
|
||||||
|
|
||||||
beforeEach((): void => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("fetchAdminUsers", (): void => {
|
|
||||||
it("calls admin/users endpoint without params when none provided", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiGet).mockResolvedValueOnce({ data: [], meta: {} } as never);
|
|
||||||
await fetchAdminUsers();
|
|
||||||
expect(client.apiGet).toHaveBeenCalledWith("/api/admin/users");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("appends page and limit params when provided", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiGet).mockResolvedValueOnce({ data: [], meta: {} } as never);
|
|
||||||
await fetchAdminUsers(2, 50);
|
|
||||||
expect(client.apiGet).toHaveBeenCalledWith("/api/admin/users?page=2&limit=50");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("throws on API error", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiGet).mockRejectedValueOnce(new Error("Network error"));
|
|
||||||
await expect(fetchAdminUsers()).rejects.toThrow("Network error");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("inviteUser", (): void => {
|
|
||||||
it("posts to invite endpoint", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiPost).mockResolvedValueOnce({ id: "inv-1" } as never);
|
|
||||||
await inviteUser({
|
|
||||||
email: "a@b.com",
|
|
||||||
name: "Alice",
|
|
||||||
workspaceId: "ws-1",
|
|
||||||
role: "MEMBER" as never,
|
|
||||||
});
|
|
||||||
expect(client.apiPost).toHaveBeenCalledWith(
|
|
||||||
"/api/admin/users/invite",
|
|
||||||
expect.objectContaining({ email: "a@b.com" })
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("updateUser", (): void => {
|
|
||||||
it("patches correct endpoint with dto", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiPatch).mockResolvedValueOnce({ id: "u1", name: "Bob" } as never);
|
|
||||||
await updateUser("u1", { name: "Bob" });
|
|
||||||
expect(client.apiPatch).toHaveBeenCalledWith("/api/admin/users/u1", { name: "Bob" });
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("deactivateUser", (): void => {
|
|
||||||
it("deletes correct endpoint", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiDelete).mockResolvedValueOnce({} as never);
|
|
||||||
await deactivateUser("u1");
|
|
||||||
expect(client.apiDelete).toHaveBeenCalledWith("/api/admin/users/u1");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,19 +1,25 @@
|
|||||||
/**
|
/**
|
||||||
* Admin API Client
|
* Admin API Client
|
||||||
* Handles admin user management requests
|
* Handles admin-scoped user and workspace management requests.
|
||||||
|
* These endpoints require AdminGuard (OWNER/ADMIN role).
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import type { WorkspaceMemberRole } from "@mosaic/shared";
|
import { apiGet, apiPost, apiPatch, apiDelete } from "./client";
|
||||||
import { apiGet, apiPatch, apiPost, apiDelete } from "./client";
|
|
||||||
|
|
||||||
export interface AdminWorkspaceMembership {
|
/* ---------------------------------------------------------------------------
|
||||||
|
Response Types (mirrors apps/api/src/admin/types/admin.types.ts)
|
||||||
|
--------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
export type WorkspaceMemberRole = "OWNER" | "ADMIN" | "MEMBER" | "GUEST";
|
||||||
|
|
||||||
|
export interface WorkspaceMembershipResponse {
|
||||||
workspaceId: string;
|
workspaceId: string;
|
||||||
workspaceName: string;
|
workspaceName: string;
|
||||||
role: WorkspaceMemberRole;
|
role: WorkspaceMemberRole;
|
||||||
joinedAt: string;
|
joinedAt: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface AdminUser {
|
export interface AdminUserResponse {
|
||||||
id: string;
|
id: string;
|
||||||
name: string;
|
name: string;
|
||||||
email: string;
|
email: string;
|
||||||
@@ -24,11 +30,11 @@ export interface AdminUser {
|
|||||||
isLocalAuth: boolean;
|
isLocalAuth: boolean;
|
||||||
invitedAt: string | null;
|
invitedAt: string | null;
|
||||||
invitedBy: string | null;
|
invitedBy: string | null;
|
||||||
workspaceMemberships: AdminWorkspaceMembership[];
|
workspaceMemberships: WorkspaceMembershipResponse[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface AdminUsersResponse {
|
export interface PaginatedAdminResponse<T> {
|
||||||
data: AdminUser[];
|
data: T[];
|
||||||
meta: {
|
meta: {
|
||||||
total: number;
|
total: number;
|
||||||
page: number;
|
page: number;
|
||||||
@@ -37,13 +43,6 @@ export interface AdminUsersResponse {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface InviteUserDto {
|
|
||||||
email: string;
|
|
||||||
name?: string;
|
|
||||||
workspaceId?: string;
|
|
||||||
role?: WorkspaceMemberRole;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface InvitationResponse {
|
export interface InvitationResponse {
|
||||||
userId: string;
|
userId: string;
|
||||||
invitationToken: string;
|
invitationToken: string;
|
||||||
@@ -51,6 +50,17 @@ export interface InvitationResponse {
|
|||||||
invitedAt: string;
|
invitedAt: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ---------------------------------------------------------------------------
|
||||||
|
Request DTOs
|
||||||
|
--------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
export interface InviteUserDto {
|
||||||
|
email: string;
|
||||||
|
name?: string;
|
||||||
|
workspaceId?: string;
|
||||||
|
role?: WorkspaceMemberRole;
|
||||||
|
}
|
||||||
|
|
||||||
export interface UpdateUserDto {
|
export interface UpdateUserDto {
|
||||||
name?: string;
|
name?: string;
|
||||||
deactivatedAt?: string | null;
|
deactivatedAt?: string | null;
|
||||||
@@ -58,41 +68,30 @@ export interface UpdateUserDto {
|
|||||||
preferences?: Record<string, unknown>;
|
preferences?: Record<string, unknown>;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/* ---------------------------------------------------------------------------
|
||||||
* Fetch paginated admin users
|
API Functions
|
||||||
*/
|
--------------------------------------------------------------------------- */
|
||||||
export async function fetchAdminUsers(page?: number, limit?: number): Promise<AdminUsersResponse> {
|
|
||||||
const params = new URLSearchParams();
|
|
||||||
|
|
||||||
if (page !== undefined) {
|
export async function fetchAdminUsers(
|
||||||
params.append("page", String(page));
|
page = 1,
|
||||||
}
|
limit = 50
|
||||||
|
): Promise<PaginatedAdminResponse<AdminUserResponse>> {
|
||||||
if (limit !== undefined) {
|
return apiGet<PaginatedAdminResponse<AdminUserResponse>>(
|
||||||
params.append("limit", String(limit));
|
`/api/admin/users?page=${String(page)}&limit=${String(limit)}`
|
||||||
}
|
);
|
||||||
|
|
||||||
const endpoint = `/api/admin/users${params.toString() ? `?${params.toString()}` : ""}`;
|
|
||||||
return apiGet<AdminUsersResponse>(endpoint);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Invite a user by email
|
|
||||||
*/
|
|
||||||
export async function inviteUser(dto: InviteUserDto): Promise<InvitationResponse> {
|
export async function inviteUser(dto: InviteUserDto): Promise<InvitationResponse> {
|
||||||
return apiPost<InvitationResponse>("/api/admin/users/invite", dto);
|
return apiPost<InvitationResponse>("/api/admin/users/invite", dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
export async function updateUser(
|
||||||
* Update admin user fields
|
userId: string,
|
||||||
*/
|
dto: UpdateUserDto
|
||||||
export async function updateUser(id: string, dto: UpdateUserDto): Promise<AdminUser> {
|
): Promise<AdminUserResponse> {
|
||||||
return apiPatch<AdminUser>(`/api/admin/users/${id}`, dto);
|
return apiPatch<AdminUserResponse>(`/api/admin/users/${userId}`, dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
export async function deactivateUser(userId: string): Promise<void> {
|
||||||
* Deactivate a user account
|
await apiDelete(`/api/admin/users/${userId}`);
|
||||||
*/
|
|
||||||
export async function deactivateUser(id: string): Promise<AdminUser> {
|
|
||||||
return apiDelete<AdminUser>(`/api/admin/users/${id}`);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,4 +16,3 @@ export * from "./telemetry";
|
|||||||
export * from "./dashboard";
|
export * from "./dashboard";
|
||||||
export * from "./projects";
|
export * from "./projects";
|
||||||
export * from "./workspaces";
|
export * from "./workspaces";
|
||||||
export * from "./admin";
|
|
||||||
|
|||||||
@@ -1,53 +0,0 @@
|
|||||||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
|
||||||
import * as client from "./client";
|
|
||||||
import { fetchTeams, createTeam, fetchTeamMembers } from "./teams";
|
|
||||||
|
|
||||||
vi.mock("./client");
|
|
||||||
|
|
||||||
const localStorageMock = {
|
|
||||||
getItem: vi.fn().mockReturnValue("ws-1"),
|
|
||||||
setItem: vi.fn(),
|
|
||||||
clear: vi.fn(),
|
|
||||||
removeItem: vi.fn(),
|
|
||||||
length: 0,
|
|
||||||
key: vi.fn(),
|
|
||||||
};
|
|
||||||
Object.defineProperty(window, "localStorage", { value: localStorageMock });
|
|
||||||
|
|
||||||
beforeEach((): void => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
localStorageMock.getItem.mockReturnValue("ws-1");
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("fetchTeams", (): void => {
|
|
||||||
it("calls teams endpoint for active workspace", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiGet).mockResolvedValueOnce([] as never);
|
|
||||||
await fetchTeams();
|
|
||||||
expect(client.apiGet).toHaveBeenCalledWith("/api/workspaces/ws-1/teams", "ws-1");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("throws if no workspace id in localStorage", async (): Promise<void> => {
|
|
||||||
localStorageMock.getItem.mockReturnValue(null);
|
|
||||||
await expect(fetchTeams()).rejects.toThrow();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("createTeam", (): void => {
|
|
||||||
it("posts to teams endpoint", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiPost).mockResolvedValueOnce({ id: "t1", name: "Dev" } as never);
|
|
||||||
await createTeam({ name: "Dev" });
|
|
||||||
expect(client.apiPost).toHaveBeenCalledWith(
|
|
||||||
"/api/workspaces/ws-1/teams",
|
|
||||||
expect.objectContaining({ name: "Dev" }),
|
|
||||||
"ws-1"
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("fetchTeamMembers", (): void => {
|
|
||||||
it("calls members endpoint for team", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiGet).mockResolvedValueOnce([] as never);
|
|
||||||
await fetchTeamMembers("t-1");
|
|
||||||
expect(client.apiGet).toHaveBeenCalledWith("/api/workspaces/ws-1/teams/t-1/members", "ws-1");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,53 +1,14 @@
|
|||||||
/**
|
/**
|
||||||
* Teams API Client
|
* Teams API Client
|
||||||
* Handles workspace-scoped team API requests.
|
* Handles team-related API requests
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import type { TeamMemberRole } from "@mosaic/shared";
|
import type { Team, TeamMember, User } from "@mosaic/shared";
|
||||||
import { apiDelete, apiGet, apiPost } from "./client";
|
import { TeamMemberRole } from "@mosaic/shared";
|
||||||
|
import { apiGet, apiPost, apiPatch, apiDelete, type ApiResponse } from "./client";
|
||||||
|
|
||||||
const WORKSPACE_STORAGE_KEY = "mosaic-workspace-id";
|
export interface TeamWithMembers extends Team {
|
||||||
|
members: (TeamMember & { user: User })[];
|
||||||
function resolveWorkspaceId(explicitWorkspaceId?: string): string {
|
|
||||||
if (explicitWorkspaceId !== undefined) {
|
|
||||||
return explicitWorkspaceId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof window === "undefined") {
|
|
||||||
throw new Error("Workspace context is unavailable outside the browser");
|
|
||||||
}
|
|
||||||
|
|
||||||
const workspaceId = window.localStorage.getItem(WORKSPACE_STORAGE_KEY);
|
|
||||||
if (!workspaceId) {
|
|
||||||
throw new Error("No active workspace selected");
|
|
||||||
}
|
|
||||||
|
|
||||||
return workspaceId;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface TeamRecord {
|
|
||||||
id: string;
|
|
||||||
workspaceId: string;
|
|
||||||
name: string;
|
|
||||||
description: string | null;
|
|
||||||
metadata: Record<string, unknown>;
|
|
||||||
createdAt: string;
|
|
||||||
updatedAt: string;
|
|
||||||
_count?: {
|
|
||||||
members: number;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface TeamMemberRecord {
|
|
||||||
teamId: string;
|
|
||||||
userId: string;
|
|
||||||
role: TeamMemberRole;
|
|
||||||
joinedAt: string;
|
|
||||||
user?: {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
email: string;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface CreateTeamDto {
|
export interface CreateTeamDto {
|
||||||
@@ -55,81 +16,200 @@ export interface CreateTeamDto {
|
|||||||
description?: string;
|
description?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface UpdateTeamDto {
|
||||||
|
name?: string;
|
||||||
|
description?: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface AddTeamMemberDto {
|
export interface AddTeamMemberDto {
|
||||||
userId: string;
|
userId: string;
|
||||||
role?: TeamMemberRole;
|
role?: TeamMemberRole;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetch all teams in the active workspace.
|
* Fetch all teams for a workspace
|
||||||
*/
|
*/
|
||||||
export async function fetchTeams(workspaceId?: string): Promise<TeamRecord[]> {
|
export async function fetchTeams(workspaceId: string): Promise<Team[]> {
|
||||||
const resolvedWorkspaceId = resolveWorkspaceId(workspaceId);
|
const response = await apiGet<ApiResponse<Team[]>>(`/api/workspaces/${workspaceId}/teams`);
|
||||||
return apiGet<TeamRecord[]>(`/api/workspaces/${resolvedWorkspaceId}/teams`, resolvedWorkspaceId);
|
return response.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a team in the active workspace.
|
* Fetch a single team with members
|
||||||
*/
|
*/
|
||||||
export async function createTeam(dto: CreateTeamDto, workspaceId?: string): Promise<TeamRecord> {
|
export async function fetchTeam(workspaceId: string, teamId: string): Promise<TeamWithMembers> {
|
||||||
const resolvedWorkspaceId = resolveWorkspaceId(workspaceId);
|
const response = await apiGet<ApiResponse<TeamWithMembers>>(
|
||||||
return apiPost<TeamRecord>(
|
`/api/workspaces/${workspaceId}/teams/${teamId}`
|
||||||
`/api/workspaces/${resolvedWorkspaceId}/teams`,
|
|
||||||
dto,
|
|
||||||
resolvedWorkspaceId
|
|
||||||
);
|
);
|
||||||
|
return response.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetch team members for a team in the active workspace.
|
* Create a new team
|
||||||
* The current backend route shape is workspace-scoped team membership.
|
|
||||||
*/
|
*/
|
||||||
export async function fetchTeamMembers(
|
export async function createTeam(workspaceId: string, data: CreateTeamDto): Promise<Team> {
|
||||||
|
const response = await apiPost<ApiResponse<Team>>(`/api/workspaces/${workspaceId}/teams`, data);
|
||||||
|
return response.data;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update a team
|
||||||
|
*/
|
||||||
|
export async function updateTeam(
|
||||||
|
workspaceId: string,
|
||||||
teamId: string,
|
teamId: string,
|
||||||
workspaceId?: string
|
data: UpdateTeamDto
|
||||||
): Promise<TeamMemberRecord[]> {
|
): Promise<Team> {
|
||||||
const resolvedWorkspaceId = resolveWorkspaceId(workspaceId);
|
const response = await apiPatch<ApiResponse<Team>>(
|
||||||
return apiGet<TeamMemberRecord[]>(
|
`/api/workspaces/${workspaceId}/teams/${teamId}`,
|
||||||
`/api/workspaces/${resolvedWorkspaceId}/teams/${teamId}/members`,
|
data
|
||||||
resolvedWorkspaceId
|
|
||||||
);
|
);
|
||||||
|
return response.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete a team in the active workspace.
|
* Delete a team
|
||||||
*/
|
*/
|
||||||
export async function deleteTeam(teamId: string, workspaceId?: string): Promise<void> {
|
export async function deleteTeam(workspaceId: string, teamId: string): Promise<void> {
|
||||||
const resolvedWorkspaceId = resolveWorkspaceId(workspaceId);
|
await apiDelete(`/api/workspaces/${workspaceId}/teams/${teamId}`);
|
||||||
await apiDelete(`/api/workspaces/${resolvedWorkspaceId}/teams/${teamId}`, resolvedWorkspaceId);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a member to a team in the active workspace.
|
* Add a member to a team
|
||||||
*/
|
*/
|
||||||
export async function addTeamMember(
|
export async function addTeamMember(
|
||||||
|
workspaceId: string,
|
||||||
teamId: string,
|
teamId: string,
|
||||||
data: AddTeamMemberDto,
|
data: AddTeamMemberDto
|
||||||
workspaceId?: string
|
): Promise<TeamMember> {
|
||||||
): Promise<TeamMemberRecord> {
|
const response = await apiPost<ApiResponse<TeamMember>>(
|
||||||
const resolvedWorkspaceId = resolveWorkspaceId(workspaceId);
|
`/api/workspaces/${workspaceId}/teams/${teamId}/members`,
|
||||||
return apiPost<TeamMemberRecord>(
|
data
|
||||||
`/api/workspaces/${resolvedWorkspaceId}/teams/${teamId}/members`,
|
|
||||||
data,
|
|
||||||
resolvedWorkspaceId
|
|
||||||
);
|
);
|
||||||
|
return response.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove a member from a team in the active workspace.
|
* Remove a member from a team
|
||||||
*/
|
*/
|
||||||
export async function removeTeamMember(
|
export async function removeTeamMember(
|
||||||
|
workspaceId: string,
|
||||||
|
teamId: string,
|
||||||
|
userId: string
|
||||||
|
): Promise<void> {
|
||||||
|
await apiDelete(`/api/workspaces/${workspaceId}/teams/${teamId}/members/${userId}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update a team member's role
|
||||||
|
*/
|
||||||
|
export async function updateTeamMemberRole(
|
||||||
|
workspaceId: string,
|
||||||
teamId: string,
|
teamId: string,
|
||||||
userId: string,
|
userId: string,
|
||||||
workspaceId?: string
|
role: TeamMemberRole
|
||||||
): Promise<void> {
|
): Promise<TeamMember> {
|
||||||
const resolvedWorkspaceId = resolveWorkspaceId(workspaceId);
|
const response = await apiPatch<ApiResponse<TeamMember>>(
|
||||||
await apiDelete(
|
`/api/workspaces/${workspaceId}/teams/${teamId}/members/${userId}`,
|
||||||
`/api/workspaces/${resolvedWorkspaceId}/teams/${teamId}/members/${userId}`,
|
{ role }
|
||||||
resolvedWorkspaceId
|
|
||||||
);
|
);
|
||||||
|
return response.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mock teams for development (until backend endpoints are ready)
|
||||||
|
*/
|
||||||
|
export const mockTeams: Team[] = [
|
||||||
|
{
|
||||||
|
id: "team-1",
|
||||||
|
workspaceId: "workspace-1",
|
||||||
|
name: "Engineering",
|
||||||
|
description: "Product development team",
|
||||||
|
metadata: {},
|
||||||
|
createdAt: new Date("2026-01-20"),
|
||||||
|
updatedAt: new Date("2026-01-20"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "team-2",
|
||||||
|
workspaceId: "workspace-1",
|
||||||
|
name: "Design",
|
||||||
|
description: "UI/UX design team",
|
||||||
|
metadata: {},
|
||||||
|
createdAt: new Date("2026-01-22"),
|
||||||
|
updatedAt: new Date("2026-01-22"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "team-3",
|
||||||
|
workspaceId: "workspace-1",
|
||||||
|
name: "Marketing",
|
||||||
|
description: null,
|
||||||
|
metadata: {},
|
||||||
|
createdAt: new Date("2026-01-25"),
|
||||||
|
updatedAt: new Date("2026-01-25"),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mock team with members for development
|
||||||
|
*/
|
||||||
|
const baseTeam = mockTeams[0];
|
||||||
|
if (!baseTeam) {
|
||||||
|
throw new Error("Mock team not found");
|
||||||
|
}
|
||||||
|
export const mockTeamWithMembers: TeamWithMembers = {
|
||||||
|
id: baseTeam.id,
|
||||||
|
workspaceId: baseTeam.workspaceId,
|
||||||
|
name: baseTeam.name,
|
||||||
|
description: baseTeam.description,
|
||||||
|
metadata: baseTeam.metadata,
|
||||||
|
createdAt: baseTeam.createdAt,
|
||||||
|
updatedAt: baseTeam.updatedAt,
|
||||||
|
members: [
|
||||||
|
{
|
||||||
|
teamId: "team-1",
|
||||||
|
userId: "user-1",
|
||||||
|
role: TeamMemberRole.OWNER,
|
||||||
|
joinedAt: new Date("2026-01-20"),
|
||||||
|
user: {
|
||||||
|
id: "user-1",
|
||||||
|
email: "john@example.com",
|
||||||
|
name: "John Doe",
|
||||||
|
emailVerified: true,
|
||||||
|
image: null,
|
||||||
|
authProviderId: null,
|
||||||
|
preferences: {},
|
||||||
|
deactivatedAt: null,
|
||||||
|
isLocalAuth: false,
|
||||||
|
passwordHash: null,
|
||||||
|
invitedBy: null,
|
||||||
|
invitationToken: null,
|
||||||
|
invitedAt: null,
|
||||||
|
createdAt: new Date("2026-01-15"),
|
||||||
|
updatedAt: new Date("2026-01-15"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
teamId: "team-1",
|
||||||
|
userId: "user-2",
|
||||||
|
role: TeamMemberRole.MEMBER,
|
||||||
|
joinedAt: new Date("2026-01-21"),
|
||||||
|
user: {
|
||||||
|
id: "user-2",
|
||||||
|
email: "jane@example.com",
|
||||||
|
name: "Jane Smith",
|
||||||
|
emailVerified: true,
|
||||||
|
image: null,
|
||||||
|
authProviderId: null,
|
||||||
|
preferences: {},
|
||||||
|
deactivatedAt: null,
|
||||||
|
isLocalAuth: false,
|
||||||
|
passwordHash: null,
|
||||||
|
invitedBy: null,
|
||||||
|
invitationToken: null,
|
||||||
|
invitedAt: null,
|
||||||
|
createdAt: new Date("2026-01-16"),
|
||||||
|
updatedAt: new Date("2026-01-16"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|||||||
@@ -1,65 +0,0 @@
|
|||||||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
|
||||||
import * as client from "./client";
|
|
||||||
import {
|
|
||||||
fetchUserWorkspaces,
|
|
||||||
fetchWorkspaceMembers,
|
|
||||||
addWorkspaceMember,
|
|
||||||
updateWorkspaceMemberRole,
|
|
||||||
removeWorkspaceMember,
|
|
||||||
} from "./workspaces";
|
|
||||||
|
|
||||||
vi.mock("./client");
|
|
||||||
|
|
||||||
beforeEach((): void => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("fetchUserWorkspaces", (): void => {
|
|
||||||
it("calls correct endpoint", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiGet).mockResolvedValueOnce([] as never);
|
|
||||||
await fetchUserWorkspaces();
|
|
||||||
expect(client.apiGet).toHaveBeenCalledWith("/api/workspaces");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("fetchWorkspaceMembers", (): void => {
|
|
||||||
it("calls correct endpoint with workspace id", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiGet).mockResolvedValueOnce([] as never);
|
|
||||||
await fetchWorkspaceMembers("ws-1");
|
|
||||||
expect(client.apiGet).toHaveBeenCalledWith("/api/workspaces/ws-1/members");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("throws on error", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiGet).mockRejectedValueOnce(new Error("Forbidden"));
|
|
||||||
await expect(fetchWorkspaceMembers("ws-1")).rejects.toThrow("Forbidden");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("addWorkspaceMember", (): void => {
|
|
||||||
it("posts to correct endpoint", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiPost).mockResolvedValueOnce({} as never);
|
|
||||||
await addWorkspaceMember("ws-1", { userId: "u1", role: "MEMBER" as never });
|
|
||||||
expect(client.apiPost).toHaveBeenCalledWith("/api/workspaces/ws-1/members", {
|
|
||||||
userId: "u1",
|
|
||||||
role: "MEMBER",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("updateWorkspaceMemberRole", (): void => {
|
|
||||||
it("patches correct endpoint", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiPatch).mockResolvedValueOnce({} as never);
|
|
||||||
await updateWorkspaceMemberRole("ws-1", "u1", { role: "ADMIN" as never });
|
|
||||||
expect(client.apiPatch).toHaveBeenCalledWith("/api/workspaces/ws-1/members/u1", {
|
|
||||||
role: "ADMIN",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("removeWorkspaceMember", (): void => {
|
|
||||||
it("calls delete on correct endpoint", async (): Promise<void> => {
|
|
||||||
vi.mocked(client.apiDelete).mockResolvedValueOnce(undefined as never);
|
|
||||||
await removeWorkspaceMember("ws-1", "u1");
|
|
||||||
expect(client.apiDelete).toHaveBeenCalledWith("/api/workspaces/ws-1/members/u1");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -3,82 +3,24 @@
|
|||||||
* User-scoped workspace discovery — does NOT require X-Workspace-Id header.
|
* User-scoped workspace discovery — does NOT require X-Workspace-Id header.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import type { WorkspaceMemberRole } from "@mosaic/shared";
|
import { apiGet } from "./client";
|
||||||
import { apiDelete, apiGet, apiPatch, apiPost } from "./client";
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A workspace entry from the user's membership list.
|
||||||
|
* Matches WorkspaceResponseDto from the API.
|
||||||
|
*/
|
||||||
export interface UserWorkspace {
|
export interface UserWorkspace {
|
||||||
id: string;
|
id: string;
|
||||||
name: string;
|
name: string;
|
||||||
ownerId: string;
|
ownerId: string;
|
||||||
role: WorkspaceMemberRole;
|
role: string;
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface CreateWorkspaceDto {
|
/**
|
||||||
name: string;
|
* Fetch all workspaces the authenticated user is a member of.
|
||||||
}
|
* The API auto-provisions a default workspace if the user has none.
|
||||||
|
*/
|
||||||
export interface CreatedWorkspace {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
ownerId: string;
|
|
||||||
settings: Record<string, unknown>;
|
|
||||||
createdAt: string;
|
|
||||||
updatedAt: string;
|
|
||||||
memberCount: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface WorkspaceMemberUser {
|
|
||||||
id: string;
|
|
||||||
email: string;
|
|
||||||
name: string | null;
|
|
||||||
image: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface WorkspaceMemberEntry {
|
|
||||||
workspaceId: string;
|
|
||||||
userId: string;
|
|
||||||
role: WorkspaceMemberRole;
|
|
||||||
joinedAt: string;
|
|
||||||
user: WorkspaceMemberUser;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AddMemberDto {
|
|
||||||
userId: string;
|
|
||||||
role: WorkspaceMemberRole;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface UpdateMemberRoleDto {
|
|
||||||
role: WorkspaceMemberRole;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function fetchUserWorkspaces(): Promise<UserWorkspace[]> {
|
export async function fetchUserWorkspaces(): Promise<UserWorkspace[]> {
|
||||||
return apiGet<UserWorkspace[]>("/api/workspaces");
|
return apiGet<UserWorkspace[]>("/api/workspaces");
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function createWorkspace(dto: CreateWorkspaceDto): Promise<CreatedWorkspace> {
|
|
||||||
return apiPost<CreatedWorkspace>("/api/admin/workspaces", dto);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function fetchWorkspaceMembers(workspaceId: string): Promise<WorkspaceMemberEntry[]> {
|
|
||||||
return apiGet<WorkspaceMemberEntry[]>(`/api/workspaces/${workspaceId}/members`);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function addWorkspaceMember(
|
|
||||||
workspaceId: string,
|
|
||||||
dto: AddMemberDto
|
|
||||||
): Promise<WorkspaceMemberEntry> {
|
|
||||||
return apiPost<WorkspaceMemberEntry>(`/api/workspaces/${workspaceId}/members`, dto);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function updateWorkspaceMemberRole(
|
|
||||||
workspaceId: string,
|
|
||||||
userId: string,
|
|
||||||
dto: UpdateMemberRoleDto
|
|
||||||
): Promise<WorkspaceMemberEntry> {
|
|
||||||
return apiPatch<WorkspaceMemberEntry>(`/api/workspaces/${workspaceId}/members/${userId}`, dto);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function removeWorkspaceMember(workspaceId: string, userId: string): Promise<void> {
|
|
||||||
await apiDelete<unknown>(`/api/workspaces/${workspaceId}/members/${userId}`);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
|||||||
import { render, screen, waitFor } from "@testing-library/react";
|
import { render, screen, waitFor } from "@testing-library/react";
|
||||||
import { AuthProvider, useAuth } from "./auth-context";
|
import { AuthProvider, useAuth } from "./auth-context";
|
||||||
import type { AuthUser } from "@mosaic/shared";
|
import type { AuthUser } from "@mosaic/shared";
|
||||||
import { WorkspaceMemberRole } from "@mosaic/shared";
|
|
||||||
|
|
||||||
// Mock the API client
|
// Mock the API client
|
||||||
vi.mock("../api/client", () => ({
|
vi.mock("../api/client", () => ({
|
||||||
@@ -762,7 +761,7 @@ describe("AuthContext", (): void => {
|
|||||||
id: "ws-1",
|
id: "ws-1",
|
||||||
name: "My Workspace",
|
name: "My Workspace",
|
||||||
ownerId: "user-1",
|
ownerId: "user-1",
|
||||||
role: WorkspaceMemberRole.OWNER,
|
role: "OWNER",
|
||||||
createdAt: "2026-01-01",
|
createdAt: "2026-01-01",
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
@@ -796,14 +795,14 @@ describe("AuthContext", (): void => {
|
|||||||
id: "ws-abc-123",
|
id: "ws-abc-123",
|
||||||
name: "My Workspace",
|
name: "My Workspace",
|
||||||
ownerId: "user-1",
|
ownerId: "user-1",
|
||||||
role: WorkspaceMemberRole.OWNER,
|
role: "OWNER",
|
||||||
createdAt: "2026-01-01",
|
createdAt: "2026-01-01",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: "ws-def-456",
|
id: "ws-def-456",
|
||||||
name: "Second Workspace",
|
name: "Second Workspace",
|
||||||
ownerId: "other",
|
ownerId: "other",
|
||||||
role: WorkspaceMemberRole.MEMBER,
|
role: "MEMBER",
|
||||||
createdAt: "2026-02-01",
|
createdAt: "2026-02-01",
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
@@ -893,7 +892,7 @@ describe("AuthContext", (): void => {
|
|||||||
id: "ws-1",
|
id: "ws-1",
|
||||||
name: "My Workspace",
|
name: "My Workspace",
|
||||||
ownerId: "user-1",
|
ownerId: "user-1",
|
||||||
role: WorkspaceMemberRole.OWNER,
|
role: "OWNER",
|
||||||
createdAt: "2026-01-01",
|
createdAt: "2026-01-01",
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ export function useLayout(): UseLayoutReturn {
|
|||||||
if (stored) {
|
if (stored) {
|
||||||
const emptyFallback: Record<string, LayoutConfig> = {};
|
const emptyFallback: Record<string, LayoutConfig> = {};
|
||||||
const parsed = safeJsonParse(stored, isLayoutConfigRecord, emptyFallback);
|
const parsed = safeJsonParse(stored, isLayoutConfigRecord, emptyFallback);
|
||||||
const parsedLayouts = parsed as Record<string, LayoutConfig>;
|
const parsedLayouts = parsed;
|
||||||
if (Object.keys(parsedLayouts).length > 0) {
|
if (Object.keys(parsedLayouts).length > 0) {
|
||||||
setLayouts(parsedLayouts);
|
setLayouts(parsedLayouts);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
103
docs/TASKS.md
103
docs/TASKS.md
@@ -1,73 +1,38 @@
|
|||||||
# Tasks — MS21 Multi-Tenant RBAC Data Migration
|
# Tasks — MS21 Multi-Tenant RBAC Data Migration
|
||||||
|
|
||||||
> Single-writer: orchestrator (Jarvis/OpenClaw) only. Workers read but never modify.
|
> Single-writer: orchestrator (Jarvis/OpenClaw) only. Workers read but never modify.
|
||||||
> Schema: id | status | milestone | description | issue | repo | branch | depends_on | blocks | agent | started_at | completed_at | estimate | used | notes
|
|
||||||
|
|
||||||
| id | status | milestone | description | issue | repo | branch | depends_on | blocks | agent | started_at | completed_at | estimate | used | notes |
|
| id | status | milestone | description | pr | agent | notes |
|
||||||
| -------------- | ----------- | --------- | --------------------------------------------------------------------------------- | -------- | ----- | ------------------------------ | ----------------------------------------------------------- | -------------------------- | --------------- | ---------- | ------------ | -------- | ---- | --------------------------------------------------------------------------------------------------------------------- |
|
|----|--------|-----------|-------------|----|-------|-------|
|
||||||
| MS21-PLAN-001 | done | phase-1 | Write PRD, init mission, populate TASKS.md | TASKS:P1 | stack | chore/ms21-init | — | MS21-DB-001 | orchestrator | 2026-02-28 | 2026-02-28 | 10K | 12K | PR #552, CI green |
|
| MS21-PLAN-001 | done | phase-1 | Write PRD, init mission, populate TASKS.md | #552 | orchestrator | CI: #552 green |
|
||||||
| MS21-DB-001 | done | phase-1 | Prisma migration: add user fields | TASKS:P1 | api | feat/ms21-schema | MS21-PLAN-001 | MS21-API-001 | claude-worker-1 | 2026-02-28 | 2026-02-28 | 10K | 9K | PR #553, CI green |
|
| MS21-DB-001 | done | phase-1 | Prisma migration: add user fields | #553 | claude-worker-1 | CI: #684 green |
|
||||||
| MS21-API-001 | done | phase-1 | AdminModule with user/workspace admin endpoints | TASKS:P1 | api | feat/ms21-admin-api | MS21-DB-001 | MS21-TEST-001 | claude-worker-2 | 2026-02-28 | 2026-02-28 | 20K | 18K | PR #555, CI green |
|
| MS21-API-001 | done | phase-1 | AdminModule with user/workspace admin endpoints | #555 | claude-worker-2 | CI: #689 green |
|
||||||
| MS21-API-002 | done | phase-1 | Admin user endpoints (list, invite, update, deactivate) | TASKS:P1 | api | feat/ms21-admin-api | MS21-DB-001 | MS21-TEST-001 | claude-worker-2 | 2026-02-28 | 2026-02-28 | — | — | Combined with API-001 |
|
| MS21-API-002 | done | phase-1 | Admin user endpoints (list, invite, update, deactivate) | #555 | claude-worker-2 | Combined with API-001 |
|
||||||
| MS21-API-003 | done | phase-1 | Workspace member management endpoints | TASKS:P1 | api | feat/ms21-workspace-members | MS21-DB-001 | — | codex-worker-1 | 2026-02-28 | 2026-02-28 | 15K | 14K | PR #556, CI green |
|
| MS21-API-003 | done | phase-1 | Workspace member management endpoints | #556 | codex-worker-1 | CI: #700 green |
|
||||||
| MS21-API-004 | done | phase-1 | Team management module | TASKS:P1 | api | feat/ms21-teams | MS21-DB-001 | — | codex-worker-2 | 2026-02-28 | 2026-02-28 | 15K | 13K | PR #564, CI green |
|
| MS21-API-004 | done | phase-1 | Team management module | #564 | codex-worker-2 | CI: #707 green |
|
||||||
| MS21-API-005 | done | phase-1 | Admin workspace endpoints | TASKS:P1 | api | feat/ms21-admin-api | MS21-DB-001 | — | claude-worker-2 | 2026-02-28 | 2026-02-28 | — | — | Combined with API-001 |
|
| MS21-API-005 | done | phase-1 | Admin workspace endpoints | #555 | claude-worker-2 | Combined with API-001 |
|
||||||
| MS21-TEST-001 | done | phase-1 | Unit tests for AdminService and AdminController | TASKS:P1 | api | feat/ms21-admin-api | MS21-API-001 | — | claude-worker-2 | 2026-02-28 | 2026-02-28 | 15K | — | PR #555, 26 tests |
|
| MS21-TEST-001 | done | phase-1 | Unit tests for AdminService and AdminController | #555 | claude-worker-2 | 26 tests included |
|
||||||
| MS21-FIX-001 | done | phase-1 | Fix flaky CI tests (rate limit timeout + log sanitizer) | TASKS:P1 | api | fix/ms21-flaky-ci | MS21-API-001 | — | codex-worker-3 | 2026-02-28 | 2026-02-28 | 8K | 7K | PR #562, CI green |
|
| MS21-AUTH-001 | done | phase-2 | LocalAuthModule: break-glass auth | #559 | claude-worker-3 | CI: #691 green |
|
||||||
| MS21-AUTH-001 | done | phase-2 | LocalAuthModule: break-glass auth | TASKS:P2 | api | feat/ms21-local-auth | MS21-DB-001 | MS21-TEST-002 | claude-worker-3 | 2026-02-28 | 2026-02-28 | 20K | 19K | PR #559, CI green |
|
| MS21-AUTH-002 | done | phase-2 | Break-glass setup endpoint | #559 | claude-worker-3 | Combined with AUTH-001 |
|
||||||
| MS21-AUTH-002 | done | phase-2 | Break-glass setup endpoint | TASKS:P2 | api | feat/ms21-local-auth | MS21-AUTH-001 | — | claude-worker-3 | 2026-02-28 | 2026-02-28 | — | — | Combined with AUTH-001 |
|
| MS21-AUTH-003 | done | phase-2 | Break-glass login endpoint | #559 | claude-worker-3 | Combined with AUTH-001 |
|
||||||
| MS21-AUTH-003 | done | phase-2 | Break-glass login endpoint | TASKS:P2 | api | feat/ms21-local-auth | MS21-AUTH-001 | — | claude-worker-3 | 2026-02-28 | 2026-02-28 | — | — | Combined with AUTH-001 |
|
| MS21-AUTH-004 | not-started | phase-2 | Deactivation session invalidation | — | — | Deferred |
|
||||||
| MS21-AUTH-004 | not-started | phase-2 | Deactivation session invalidation | TASKS:P2 | api | feat/ms21-session-invalidation | MS21-AUTH-001 | — | — | — | — | 10K | — | Deferred; do after Phase 4 |
|
| MS21-TEST-002 | done | phase-2 | Unit tests for LocalAuth | #559 | claude-worker-3 | 27 tests included |
|
||||||
| MS21-TEST-002 | done | phase-2 | Unit tests for LocalAuth | TASKS:P2 | api | feat/ms21-local-auth | MS21-AUTH-001 | — | claude-worker-3 | 2026-02-28 | 2026-02-28 | 15K | — | PR #559, 27 tests |
|
| MS21-MIG-001 | done | phase-3 | Migration script: scripts/migrate-brain.ts | #554 | codex-worker-1 | CI: #688 (test flaky, code clean) |
|
||||||
| MS21-MIG-001 | done | phase-3 | Migration script: scripts/migrate-brain.ts | #568 | api | feat/ms21-migration | MS21-DB-001 | MS21-MIG-002,MS21-TEST-003 | codex-worker-1 | 2026-02-28 | 2026-02-28 | 25K | 22K | PR #554 |
|
| MS21-MIG-002 | done | phase-3 | Migration mapping: status/priority/domain mapping | #554 | codex-worker-1 | Included in MIG-001 |
|
||||||
| MS21-MIG-002 | done | phase-3 | Migration mapping: status/priority/domain | #568 | api | feat/ms21-migration | MS21-MIG-001 | — | codex-worker-1 | 2026-02-28 | 2026-02-28 | — | — | Included in MIG-001 |
|
| MS21-MIG-003 | not-started | phase-3 | Migration execution: run on production database | — | — | Needs deploy |
|
||||||
| MS21-TEST-003 | done | phase-3 | Migration script unit tests (9/9 passing) | #568 | api | test/ms21-migration-tests | MS21-MIG-001 | — | codex | 2026-02-28 | 2026-02-28 | 20K | 17K | PR #566 merged, CI green. Review: 0 blockers, 2 should-fix (brittle harness), 0 sec issues. |
|
| MS21-MIG-004 | not-started | phase-3 | Import API endpoints | — | — | |
|
||||||
| MS21-MIG-003 | not-started | phase-3 | Run migration on production database | #568 | api | — | MS21-MIG-001,MS21-TEST-003 | MS21-VER-001 | — | — | — | 5K | — | Needs deploy coordination; not automatable |
|
| MS21-TEST-003 | not-started | phase-3 | Migration script tests | — | — | |
|
||||||
| MS21-MIG-004 | done | phase-3 | Import API endpoints (6/6 tests) | #568 | api | feat/ms21-import-api | MS21-DB-001 | — | codex | 2026-02-28 | 2026-02-28 | 20K | 24K | PR #567 merged, CI green. Review: 0 blockers, 4 should-fix, 1 medium sec (no audit log). |
|
| MS21-UI-001 | not-started | phase-4 | Settings/users page | — | — | |
|
||||||
| MS21-UI-001 | done | phase-4 | Settings/users page | #569 | web | feat/ms21-ui-users | MS21-API-001,MS21-API-002 | — | codex | 2026-02-28 | 2026-02-28 | 20K | ~30K | PR #573 merged. Review: 0 blockers, 4 should-fix → MS21-UI-001-QA |
|
| MS21-UI-002 | not-started | phase-4 | User detail/edit and invite dialogs | — | — | |
|
||||||
| MS21-UI-001-QA | not-started | phase-4 | QA: fix 4 review findings (pagination, error state, self-deactivate guard, tests) | #569 | web | fix/ms21-ui-001-qa | MS21-UI-001 | — | — | — | — | 15K | — | 0 blockers; merged per framework. Should-fix: pagination cap, error/empty collision, self-deactivate guard, no tests. |
|
| MS21-UI-003 | not-started | phase-4 | Settings/workspaces page (wire to real API) | — | — | Mock data exists |
|
||||||
| MS21-UI-002 | not-started | phase-4 | User detail/edit and invite dialogs | #569 | web | feat/ms21-ui-users | MS21-UI-001 | — | — | — | — | 15K | — | |
|
| MS21-UI-004 | not-started | phase-4 | Workspace member management UI | — | — | Components exist |
|
||||||
| MS21-UI-003 | done | phase-4 | Settings/workspaces page (wire to real API) | #569 | web | feat/ms21-ui-workspaces | MS21-API-003 | — | codex | 2026-02-28 | 2026-02-28 | 15K | ~25K | PR #574 merged. Review: 0 critical, 1 low (raw errors in UI) |
|
| MS21-UI-005 | not-started | phase-4 | Settings/teams page | — | — | |
|
||||||
| MS21-UI-004 | not-started | phase-4 | Workspace member management UI | #569 | web | feat/ms21-ui-workspaces | MS21-UI-003,MS21-API-003 | — | — | — | — | 15K | — | Components exist |
|
| MS21-TEST-004 | not-started | phase-4 | Frontend component tests | — | — | |
|
||||||
| MS21-UI-005 | not-started | phase-4 | Settings/teams page | #569 | web | feat/ms21-ui-teams | MS21-API-004 | — | — | — | — | 15K | — | |
|
| MS21-RBAC-001 | not-started | phase-5 | Sidebar navigation role gating | — | — | |
|
||||||
| MS21-TEST-004 | not-started | phase-4 | Frontend component tests | #569 | web | test/ms21-ui | MS21-UI-001,MS21-UI-002,MS21-UI-003,MS21-UI-004,MS21-UI-005 | — | — | — | — | 20K | — | |
|
| MS21-RBAC-002 | not-started | phase-5 | Settings page access restriction | — | — | |
|
||||||
| MS21-RBAC-001 | not-started | phase-5 | Sidebar navigation role gating | #570 | web | feat/ms21-rbac | MS21-UI-001 | — | — | — | — | 10K | — | |
|
| MS21-RBAC-003 | not-started | phase-5 | Action button permission gating | — | — | |
|
||||||
| MS21-RBAC-002 | not-started | phase-5 | Settings page access restriction | #570 | web | feat/ms21-rbac | MS21-RBAC-001 | — | — | — | — | 8K | — | |
|
| MS21-RBAC-004 | not-started | phase-5 | User profile role display | — | — | |
|
||||||
| MS21-RBAC-003 | done | phase-5 | Action button permission gating | #570 | web | feat/ms21-rbac | MS21-RBAC-001 | — | — | — | — | 8K | — | |
|
| MS21-VER-001 | not-started | phase-6 | Full quality gate pass | — | — | |
|
||||||
| MS21-RBAC-004 | done | phase-5 | User profile role display | #570 | web | feat/ms21-rbac | MS21-RBAC-001 | — | — | — | — | 5K | — | |
|
| MS21-VER-002 | not-started | phase-6 | Deploy and smoke test | — | — | |
|
||||||
| MS21-VER-001 | done | phase-6 | Full quality gate pass | #571 | stack | — | MS21-TEST-004,MS21-RBAC-004,MS21-MIG-003 | MS21-VER-002 | — | — | — | 5K | — | |
|
| MS21-VER-003 | not-started | phase-6 | Tag v0.0.21 | — | — | |
|
||||||
| MS21-VER-002 | done | phase-6 | Deploy and smoke test | #571 | stack | — | MS21-VER-001 | MS21-VER-003 | — | — | — | 5K | — | |
|
| MS21-FIX-001 | done | phase-1 | Fix flaky CI tests (rate limit timeout + log sanitizer) | #562 | codex-worker-3 | CI: #705 green |
|
||||||
| MS21-VER-003 | done | phase-6 | Tag v0.0.21 | #571 | stack | — | MS21-VER-002 | — | — | — | — | 2K | — | |
|
|
||||||
|
|
||||||
## Budget Summary
|
|
||||||
|
|
||||||
| Phase | Tasks | Done | Estimate | Used |
|
|
||||||
| ---------------------- | ------ | ------ | --------- | --------- |
|
|
||||||
| Phase 1 (Schema + API) | 9 | 9 | ~113K | ~93K |
|
|
||||||
| Phase 2 (Auth) | 4 | 3 | ~45K | ~19K |
|
|
||||||
| Phase 3 (Migration) | 5 | 3 | ~70K | ~63K |
|
|
||||||
| Phase 4 (UI) | 6 | 0 | ~100K | — |
|
|
||||||
| Phase 5 (RBAC) | 4 | 0 | ~31K | — |
|
|
||||||
| Phase 6 (Verification) | 3 | 0 | ~12K | — |
|
|
||||||
| **Total** | **31** | **15** | **~371K** | **~175K** |
|
|
||||||
|
|
||||||
Remaining estimate: ~143K tokens (Codex budget).
|
|
||||||
|
|
||||||
## MS22 — Fleet Evolution (Phase 0: Knowledge Layer)
|
|
||||||
|
|
||||||
| id | status | milestone | description | issue | repo | branch | depends_on | blocks | agent | started_at | completed_at | estimate | used | notes |
|
|
||||||
| --------------- | ----------- | ------------ | ------------------------------------------------------------ | -------- | ----- | ------------------------------ | --------------------------------------------------------- | ------------- | ------------ | ---------- | ------------ | -------- | ---- | --------------------------------------------- |
|
|
||||||
| MS22-PLAN-001 | done | p0-knowledge | PRD + mission bootstrap + TASKS.md | TASKS:P0 | stack | feat/ms22-knowledge-schema | — | MS22-DB-001 | orchestrator | 2026-02-28 | 2026-02-28 | 10K | 8K | PRD-MS22.md, mission fleet-evolution-20260228 |
|
|
||||||
| MS22-DB-001 | done | p0-knowledge | Findings module (pgvector, CRUD, similarity search) | TASKS:P0 | api | feat/ms22-findings | MS22-PLAN-001 | — | codex | 2026-02-28 | 2026-02-28 | 20K | ~22K | PR #585 merged, CI green |
|
|
||||||
| MS22-API-001 | done | p0-knowledge | Findings API endpoints | TASKS:P0 | api | feat/ms22-findings | MS22-DB-001 | — | codex | 2026-02-28 | 2026-02-28 | — | — | Combined with DB-001 |
|
|
||||||
| MS22-DB-002 | done | p0-knowledge | AgentMemory module (key/value store, upsert) | TASKS:P0 | api | feat/ms22-agent-memory | MS22-DB-001 | — | codex | 2026-02-28 | 2026-02-28 | 15K | ~16K | PR #586 merged, CI green |
|
|
||||||
| MS22-API-002 | done | p0-knowledge | AgentMemory API endpoints | TASKS:P0 | api | feat/ms22-agent-memory | MS22-DB-002 | — | codex | 2026-02-28 | 2026-02-28 | — | — | Combined with DB-002 |
|
|
||||||
| MS22-DB-004 | done | p0-knowledge | ConversationArchive module (pgvector, ingest, search) | TASKS:P0 | api | feat/ms22-conversation-archive | MS22-DB-001 | — | codex | 2026-02-28 | 2026-02-28 | 20K | ~18K | PR #587 merged, CI green |
|
|
||||||
| MS22-API-004 | done | p0-knowledge | ConversationArchive API endpoints | TASKS:P0 | api | feat/ms22-conversation-archive | MS22-DB-004 | — | codex | 2026-02-28 | 2026-02-28 | — | — | Combined with DB-004 |
|
|
||||||
| MS22-API-005 | done | p0-knowledge | EmbeddingService (reuse existing KnowledgeModule) | TASKS:P0 | api | — | — | — | orchestrator | 2026-02-28 | 2026-02-28 | 0 | 0 | Already existed; no work needed |
|
|
||||||
| MS22-DB-003 | not-started | p0-knowledge | Task model: add assigned_agent field + migration | TASKS:P0 | api | feat/ms22-task-agent | MS22-DB-001 | MS22-API-003 | — | — | — | 8K | — | Small schema + migration only |
|
|
||||||
| MS22-API-003 | not-started | p0-knowledge | Task API: expose assigned_agent in CRUD | TASKS:P0 | api | feat/ms22-task-agent | MS22-DB-003 | MS22-TEST-001 | — | — | — | 8K | — | Extend existing TaskModule |
|
|
||||||
| MS22-TEST-001 | not-started | p0-knowledge | Integration tests: Findings + AgentMemory + ConvArchive | TASKS:P0 | api | test/ms22-integration | MS22-API-001,MS22-API-002,MS22-API-004 | MS22-VER-P0 | — | — | — | 20K | — | E2E with live postgres |
|
|
||||||
| MS22-SKILL-001 | not-started | p0-knowledge | OpenClaw mosaic skill (agents read/write findings/memory) | TASKS:P0 | stack | feat/ms22-openclaw-skill | MS22-API-001,MS22-API-002 | MS22-VER-P0 | — | — | — | 15K | — | Skill in ~/.agents/skills/mosaic/ |
|
|
||||||
| MS22-INGEST-001 | not-started | p0-knowledge | Session log ingestion pipeline (OpenClaw logs → ConvArchive) | TASKS:P0 | stack | feat/ms22-ingest | MS22-API-004 | MS22-VER-P0 | — | — | — | 20K | — | Script to batch-ingest existing logs |
|
|
||||||
| MS22-VER-P0 | not-started | p0-knowledge | Phase 0 verification: all modules deployed + smoke tested | TASKS:P0 | stack | — | MS22-TEST-001,MS22-SKILL-001,MS22-INGEST-001,MS22-API-003 | — | — | — | — | 5K | — | |
|
|
||||||
|
|||||||
@@ -47,19 +47,3 @@ USC employees.
|
|||||||
## Corrections
|
## Corrections
|
||||||
|
|
||||||
(none yet)
|
(none yet)
|
||||||
| S2 | 2026-02-28 | Phase 3 | MS21-TEST-003, MS21-MIG-004 | PRs #566 and #567 merged, CI green. Post-coding reviews run (0 blockers both). |
|
|
||||||
|
|
||||||
## E2E Compliance — Session 2 Remediation (2026-02-28)
|
|
||||||
|
|
||||||
Identified and corrected gaps from session 1:
|
|
||||||
|
|
||||||
- Phase issues created: #568 (P3), #569 (P4), #570 (P5), #571 (P6)
|
|
||||||
- TASKS.md schema updated with all required columns (depends_on, blocks, estimate, used, started_at, completed_at, issue, branch)
|
|
||||||
- MS21-TEST-003 and MS21-MIG-004 correctly marked `done` with PR/CI evidence
|
|
||||||
- Post-coding reviews confirmed: 0 blockers on both tasks
|
|
||||||
- CI verified green: f99107f (head of main after both merges)
|
|
||||||
|
|
||||||
### Review Evidence
|
|
||||||
|
|
||||||
- MS21-TEST-003: code review verdict=request-changes, 0 blockers, 2 should-fix (brittle harness), security=none
|
|
||||||
- MS21-MIG-004: code review verdict=request-changes, 0 blockers, 4 should-fix (race conditions, validation gaps), security=medium (no audit logging — not blocking)
|
|
||||||
|
|||||||
@@ -1,64 +0,0 @@
|
|||||||
# MS22 Agent Memory Module
|
|
||||||
|
|
||||||
## Objective
|
|
||||||
|
|
||||||
Add per-agent key/value store: AgentMemory model + NestJS module with CRUD endpoints.
|
|
||||||
|
|
||||||
## Issues
|
|
||||||
|
|
||||||
- MS22-DB-002: Add AgentMemory schema model
|
|
||||||
- MS22-API-002: Add agent-memory NestJS module
|
|
||||||
|
|
||||||
## Plan
|
|
||||||
|
|
||||||
1. AgentMemory model → schema.prisma (after AgentSession, line 736)
|
|
||||||
2. Add `agentMemories AgentMemory[]` relation to Workspace model
|
|
||||||
3. Create apps/api/src/agent-memory/ with service, controller, DTOs, specs
|
|
||||||
4. Register in app.module.ts
|
|
||||||
5. Migrate: `prisma migrate dev --name ms22_agent_memory`
|
|
||||||
6. lint + build
|
|
||||||
7. Commit
|
|
||||||
|
|
||||||
## Endpoints
|
|
||||||
|
|
||||||
- PUT /api/agents/:agentId/memory/:key (upsert)
|
|
||||||
- GET /api/agents/:agentId/memory (list all)
|
|
||||||
- GET /api/agents/:agentId/memory/:key (get one)
|
|
||||||
- DELETE /api/agents/:agentId/memory/:key (remove)
|
|
||||||
|
|
||||||
## Auth
|
|
||||||
|
|
||||||
- @UseGuards(AuthGuard, WorkspaceGuard, PermissionGuard)
|
|
||||||
- @Workspace() decorator for workspaceId
|
|
||||||
- Permission.WORKSPACE_MEMBER for write ops
|
|
||||||
- Permission.WORKSPACE_ANY for read ops
|
|
||||||
|
|
||||||
## Schema
|
|
||||||
|
|
||||||
```prisma
|
|
||||||
model AgentMemory {
|
|
||||||
id String @id @default(uuid()) @db.Uuid
|
|
||||||
workspaceId String @map("workspace_id") @db.Uuid
|
|
||||||
agentId String @map("agent_id")
|
|
||||||
key String
|
|
||||||
value Json
|
|
||||||
createdAt DateTime @default(now()) @map("created_at") @db.Timestamptz
|
|
||||||
updatedAt DateTime @updatedAt @map("updated_at") @db.Timestamptz
|
|
||||||
|
|
||||||
workspace Workspace @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
|
|
||||||
|
|
||||||
@@unique([workspaceId, agentId, key])
|
|
||||||
@@index([workspaceId])
|
|
||||||
@@index([agentId])
|
|
||||||
@@map("agent_memories")
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Progress
|
|
||||||
|
|
||||||
- [ ] Schema
|
|
||||||
- [ ] Module files
|
|
||||||
- [ ] app.module.ts
|
|
||||||
- [ ] Migration
|
|
||||||
- [ ] lint/build
|
|
||||||
- [ ] Commit
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
# MS22 — Conversation Archive Module
|
|
||||||
|
|
||||||
## Objective
|
|
||||||
|
|
||||||
Implement ConversationArchive module: ingest OpenClaw session logs, store with vector embeddings for semantic search.
|
|
||||||
|
|
||||||
## Deliverables
|
|
||||||
|
|
||||||
1. ConversationArchive Prisma model
|
|
||||||
2. NestJS module at apps/api/src/conversation-archive/
|
|
||||||
3. Endpoints: ingest, search, list, get-by-id
|
|
||||||
4. Register in app.module.ts
|
|
||||||
5. Migrate, lint, build, commit
|
|
||||||
|
|
||||||
## Plan
|
|
||||||
|
|
||||||
- Add model to schema.prisma (end of file)
|
|
||||||
- Add relation to Workspace model
|
|
||||||
- Create module structure: dto/, service, controller, spec, module
|
|
||||||
- Use EmbeddingService from knowledge module (import KnowledgeModule or just PrismaModule + embed inline)
|
|
||||||
- Follow pattern: AuthGuard + WorkspaceGuard + PermissionGuard
|
|
||||||
- Endpoint prefix: conversations (maps to /api/conversations)
|
|
||||||
- Vector search: $queryRaw with <=> operator (cosine distance)
|
|
||||||
|
|
||||||
## Assumptions
|
|
||||||
|
|
||||||
- ASSUMPTION: Embedding is stored inline on ConversationArchive (not a separate table) — simpler and sufficient for this use case, matches MemoryEmbedding pattern
|
|
||||||
- ASSUMPTION: Import KnowledgeModule to reuse EmbeddingService (it exports it)
|
|
||||||
- ASSUMPTION: messageCount computed server-side from messages array length on ingest
|
|
||||||
- ASSUMPTION: Permission level WORKSPACE_MEMBER for ingest/search, WORKSPACE_ANY for list/get
|
|
||||||
|
|
||||||
## Progress
|
|
||||||
|
|
||||||
- [ ] Schema model
|
|
||||||
- [ ] Migration
|
|
||||||
- [ ] DTOs
|
|
||||||
- [ ] Service
|
|
||||||
- [ ] Controller
|
|
||||||
- [ ] Spec
|
|
||||||
- [ ] Module
|
|
||||||
- [ ] app.module.ts registration
|
|
||||||
- [ ] Lint + build
|
|
||||||
- [ ] Commit
|
|
||||||
|
|
||||||
## Risks
|
|
||||||
|
|
||||||
- EmbeddingService exports from knowledge.module — need to import KnowledgeModule
|
|
||||||
- Migration requires live DB (may need --skip-generate flag if no DB access)
|
|
||||||
@@ -74,8 +74,7 @@
|
|||||||
"tough-cookie": ">=4.1.3",
|
"tough-cookie": ">=4.1.3",
|
||||||
"undici": ">=6.23.0",
|
"undici": ">=6.23.0",
|
||||||
"rollup": ">=4.59.0",
|
"rollup": ">=4.59.0",
|
||||||
"serialize-javascript": ">=7.0.3",
|
"serialize-javascript": ">=7.0.3"
|
||||||
"multer": ">=2.1.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
21
pnpm-lock.yaml
generated
21
pnpm-lock.yaml
generated
@@ -17,7 +17,6 @@ overrides:
|
|||||||
undici: '>=6.23.0'
|
undici: '>=6.23.0'
|
||||||
rollup: '>=4.59.0'
|
rollup: '>=4.59.0'
|
||||||
serialize-javascript: '>=7.0.3'
|
serialize-javascript: '>=7.0.3'
|
||||||
multer: '>=2.1.0'
|
|
||||||
|
|
||||||
importers:
|
importers:
|
||||||
|
|
||||||
@@ -1604,7 +1603,6 @@ packages:
|
|||||||
|
|
||||||
'@mosaicstack/telemetry-client@0.1.1':
|
'@mosaicstack/telemetry-client@0.1.1':
|
||||||
resolution: {integrity: sha512-1udg6p4cs8rhQgQ2pKCfi7EpRlJieRRhA5CIqthRQ6HQZLgQ0wH+632jEulov3rlHSM1iplIQ+AAe5DWrvSkEA==, tarball: https://git.mosaicstack.dev/api/packages/mosaic/npm/%40mosaicstack%2Ftelemetry-client/-/0.1.1/telemetry-client-0.1.1.tgz}
|
resolution: {integrity: sha512-1udg6p4cs8rhQgQ2pKCfi7EpRlJieRRhA5CIqthRQ6HQZLgQ0wH+632jEulov3rlHSM1iplIQ+AAe5DWrvSkEA==, tarball: https://git.mosaicstack.dev/api/packages/mosaic/npm/%40mosaicstack%2Ftelemetry-client/-/0.1.1/telemetry-client-0.1.1.tgz}
|
||||||
engines: {node: '>=18'}
|
|
||||||
|
|
||||||
'@mrleebo/prisma-ast@0.13.1':
|
'@mrleebo/prisma-ast@0.13.1':
|
||||||
resolution: {integrity: sha512-XyroGQXcHrZdvmrGJvsA9KNeOOgGMg1Vg9OlheUsBOSKznLMDl+YChxbkboRHvtFYJEMRYmlV3uoo/njCw05iw==}
|
resolution: {integrity: sha512-XyroGQXcHrZdvmrGJvsA9KNeOOgGMg1Vg9OlheUsBOSKznLMDl+YChxbkboRHvtFYJEMRYmlV3uoo/njCw05iw==}
|
||||||
@@ -5807,6 +5805,10 @@ packages:
|
|||||||
mkdirp-classic@0.5.3:
|
mkdirp-classic@0.5.3:
|
||||||
resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
|
resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
|
||||||
|
|
||||||
|
mkdirp@0.5.6:
|
||||||
|
resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
|
||||||
|
hasBin: true
|
||||||
|
|
||||||
mkdirp@3.0.1:
|
mkdirp@3.0.1:
|
||||||
resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==}
|
resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==}
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
@@ -5835,8 +5837,8 @@ packages:
|
|||||||
msgpackr@1.11.5:
|
msgpackr@1.11.5:
|
||||||
resolution: {integrity: sha512-UjkUHN0yqp9RWKy0Lplhh+wlpdt9oQBYgULZOiFhV3VclSF1JnSQWZ5r9gORQlNYaUKQoR8itv7g7z1xDDuACA==}
|
resolution: {integrity: sha512-UjkUHN0yqp9RWKy0Lplhh+wlpdt9oQBYgULZOiFhV3VclSF1JnSQWZ5r9gORQlNYaUKQoR8itv7g7z1xDDuACA==}
|
||||||
|
|
||||||
multer@2.1.0:
|
multer@2.0.2:
|
||||||
resolution: {integrity: sha512-TBm6j41rxNohqawsxlsWsNNh/VdV4QFXcBvRcPhXaA05EZ79z0qJ2bQFpync6JBoHTeNY5Q1JpG7AlTjdlfAEA==}
|
resolution: {integrity: sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==}
|
||||||
engines: {node: '>= 10.16.0'}
|
engines: {node: '>= 10.16.0'}
|
||||||
|
|
||||||
mute-stream@2.0.0:
|
mute-stream@2.0.0:
|
||||||
@@ -8840,7 +8842,7 @@ snapshots:
|
|||||||
'@nestjs/core': 11.1.12(@nestjs/common@11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.12)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/core': 11.1.12(@nestjs/common@11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.12)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
cors: 2.8.5
|
cors: 2.8.5
|
||||||
express: 5.2.1
|
express: 5.2.1
|
||||||
multer: 2.1.0
|
multer: 2.0.2
|
||||||
path-to-regexp: 8.3.0
|
path-to-regexp: 8.3.0
|
||||||
tslib: 2.8.1
|
tslib: 2.8.1
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
@@ -13389,6 +13391,10 @@ snapshots:
|
|||||||
|
|
||||||
mkdirp-classic@0.5.3: {}
|
mkdirp-classic@0.5.3: {}
|
||||||
|
|
||||||
|
mkdirp@0.5.6:
|
||||||
|
dependencies:
|
||||||
|
minimist: 1.2.8
|
||||||
|
|
||||||
mkdirp@3.0.1: {}
|
mkdirp@3.0.1: {}
|
||||||
|
|
||||||
mlly@1.8.0:
|
mlly@1.8.0:
|
||||||
@@ -13430,12 +13436,15 @@ snapshots:
|
|||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
msgpackr-extract: 3.0.3
|
msgpackr-extract: 3.0.3
|
||||||
|
|
||||||
multer@2.1.0:
|
multer@2.0.2:
|
||||||
dependencies:
|
dependencies:
|
||||||
append-field: 1.0.0
|
append-field: 1.0.0
|
||||||
busboy: 1.6.0
|
busboy: 1.6.0
|
||||||
concat-stream: 2.0.0
|
concat-stream: 2.0.0
|
||||||
|
mkdirp: 0.5.6
|
||||||
|
object-assign: 4.1.1
|
||||||
type-is: 1.6.18
|
type-is: 1.6.18
|
||||||
|
xtend: 4.0.2
|
||||||
|
|
||||||
mute-stream@2.0.0: {}
|
mute-stream@2.0.0: {}
|
||||||
|
|
||||||
|
|||||||
@@ -1,429 +0,0 @@
|
|||||||
import { readFileSync } from "node:fs";
|
|
||||||
import { createRequire } from "node:module";
|
|
||||||
import * as path from "node:path";
|
|
||||||
import { fileURLToPath } from "node:url";
|
|
||||||
import { Script, createContext } from "node:vm";
|
|
||||||
|
|
||||||
import { describe, expect, it, vi, afterEach } from "vitest";
|
|
||||||
import { ModuleKind, ScriptTarget, transpileModule } from "typescript";
|
|
||||||
|
|
||||||
interface CliOptions {
|
|
||||||
brainPath: string;
|
|
||||||
workspaceId: string;
|
|
||||||
userId: string;
|
|
||||||
apply: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface MockDirent {
|
|
||||||
name: string;
|
|
||||||
isFile: () => boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ScriptInternals {
|
|
||||||
parseCliArgs: (args: string[]) => CliOptions;
|
|
||||||
mapTaskStatus: (rawStatus: string | null) => { status: string; issue: string | null };
|
|
||||||
mapTaskPriority: (rawPriority: string | null) => { priority: string; issue: string | null };
|
|
||||||
mapProjectStatus: (rawStatus: string | null) => { status: string; issue: string | null };
|
|
||||||
normalizeDomain: (rawDomain: string | null | undefined) => string | null;
|
|
||||||
listJsonFiles: (directoryPath: string) => Promise<string[]>;
|
|
||||||
parseTaskFile: (
|
|
||||||
rawFile: unknown,
|
|
||||||
sourceFile: string,
|
|
||||||
parseIssues: string[]
|
|
||||||
) => {
|
|
||||||
version: string;
|
|
||||||
domain: string;
|
|
||||||
sourceFile: string;
|
|
||||||
tasks: Array<{ id: string; title: string }>;
|
|
||||||
} | null;
|
|
||||||
parseProjectFile: (
|
|
||||||
rawFile: unknown,
|
|
||||||
sourceFile: string,
|
|
||||||
parseIssues: string[]
|
|
||||||
) => {
|
|
||||||
version: string;
|
|
||||||
sourceFile: string;
|
|
||||||
project: { id: string; name: string };
|
|
||||||
} | null;
|
|
||||||
loadTaskFiles: (
|
|
||||||
taskDirectory: string,
|
|
||||||
parseIssues: string[],
|
|
||||||
rootPath: string
|
|
||||||
) => Promise<
|
|
||||||
Array<{
|
|
||||||
version: string;
|
|
||||||
domain: string;
|
|
||||||
sourceFile: string;
|
|
||||||
tasks: Array<{ id: string; title: string }>;
|
|
||||||
}>
|
|
||||||
>;
|
|
||||||
main: () => Promise<void>;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface LoaderOptions {
|
|
||||||
argv?: string[];
|
|
||||||
homeDirectory?: string;
|
|
||||||
readdirImpl?: (directoryPath: string, options: unknown) => Promise<MockDirent[]>;
|
|
||||||
readFileImpl?: (filePath: string, encoding: string) => Promise<string>;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface LoaderResult {
|
|
||||||
internals: ScriptInternals;
|
|
||||||
readdirMock: ReturnType<typeof vi.fn>;
|
|
||||||
readFileMock: ReturnType<typeof vi.fn>;
|
|
||||||
prismaClientConstructor: ReturnType<typeof vi.fn>;
|
|
||||||
}
|
|
||||||
|
|
||||||
const testDir = path.dirname(fileURLToPath(import.meta.url));
|
|
||||||
const scriptPath = path.resolve(testDir, "..", "migrate-brain.ts");
|
|
||||||
const nativeRequire = createRequire(import.meta.url);
|
|
||||||
|
|
||||||
const makeDirent = (name: string, isFile: boolean): MockDirent => ({
|
|
||||||
name,
|
|
||||||
isFile: () => isFile,
|
|
||||||
});
|
|
||||||
|
|
||||||
function buildInstrumentedSource(source: string): string {
|
|
||||||
const invocationMarker = "main().catch((error: unknown) => {";
|
|
||||||
const markerIndex = source.lastIndexOf(invocationMarker);
|
|
||||||
if (markerIndex < 0) {
|
|
||||||
throw new Error("Could not find main invocation in migrate-brain.ts");
|
|
||||||
}
|
|
||||||
|
|
||||||
const sourceWithoutMain = source.slice(0, markerIndex);
|
|
||||||
return `${sourceWithoutMain}
|
|
||||||
module.exports.__test = {
|
|
||||||
parseCliArgs,
|
|
||||||
mapTaskStatus,
|
|
||||||
mapTaskPriority,
|
|
||||||
mapProjectStatus,
|
|
||||||
normalizeDomain,
|
|
||||||
listJsonFiles,
|
|
||||||
parseTaskFile,
|
|
||||||
parseProjectFile,
|
|
||||||
loadTaskFiles,
|
|
||||||
main,
|
|
||||||
};
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function loadMigrateBrainModule(options: LoaderOptions = {}): LoaderResult {
|
|
||||||
const source = readFileSync(scriptPath, "utf8");
|
|
||||||
const instrumentedSource = buildInstrumentedSource(source);
|
|
||||||
|
|
||||||
const transpiled = transpileModule(instrumentedSource, {
|
|
||||||
compilerOptions: {
|
|
||||||
module: ModuleKind.CommonJS,
|
|
||||||
target: ScriptTarget.ES2022,
|
|
||||||
esModuleInterop: true,
|
|
||||||
},
|
|
||||||
fileName: scriptPath,
|
|
||||||
});
|
|
||||||
|
|
||||||
const readdirMock = vi.fn(options.readdirImpl ?? (async (): Promise<MockDirent[]> => []));
|
|
||||||
const readFileMock = vi.fn(options.readFileImpl ?? (async (): Promise<string> => "{}"));
|
|
||||||
|
|
||||||
const prismaClientConstructor = vi.fn(() => ({
|
|
||||||
$disconnect: vi.fn(async () => undefined),
|
|
||||||
}));
|
|
||||||
|
|
||||||
const processMock = Object.create(process) as NodeJS.Process;
|
|
||||||
processMock.argv = options.argv ?? [
|
|
||||||
"node",
|
|
||||||
scriptPath,
|
|
||||||
"--workspace-id",
|
|
||||||
"workspace-1",
|
|
||||||
"--user-id",
|
|
||||||
"user-1",
|
|
||||||
];
|
|
||||||
|
|
||||||
const prismaClientModule = {
|
|
||||||
ActivityAction: { CREATED: "CREATED" },
|
|
||||||
EntityType: { DOMAIN: "DOMAIN", PROJECT: "PROJECT", TASK: "TASK" },
|
|
||||||
Prisma: {},
|
|
||||||
PrismaClient: prismaClientConstructor,
|
|
||||||
ProjectStatus: {
|
|
||||||
ACTIVE: "ACTIVE",
|
|
||||||
PLANNING: "PLANNING",
|
|
||||||
PAUSED: "PAUSED",
|
|
||||||
ARCHIVED: "ARCHIVED",
|
|
||||||
},
|
|
||||||
TaskPriority: {
|
|
||||||
HIGH: "HIGH",
|
|
||||||
MEDIUM: "MEDIUM",
|
|
||||||
LOW: "LOW",
|
|
||||||
},
|
|
||||||
TaskStatus: {
|
|
||||||
COMPLETED: "COMPLETED",
|
|
||||||
IN_PROGRESS: "IN_PROGRESS",
|
|
||||||
NOT_STARTED: "NOT_STARTED",
|
|
||||||
PAUSED: "PAUSED",
|
|
||||||
ARCHIVED: "ARCHIVED",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const module = { exports: {} as Record<string, unknown> };
|
|
||||||
|
|
||||||
const requireFromScript = (specifier: string): unknown => {
|
|
||||||
if (specifier === "node:fs/promises") {
|
|
||||||
return {
|
|
||||||
readdir: readdirMock,
|
|
||||||
readFile: readFileMock,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
if (specifier === "node:os") {
|
|
||||||
return {
|
|
||||||
homedir: () => options.homeDirectory ?? "/home/tester",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
if (specifier === "node:process") {
|
|
||||||
return processMock;
|
|
||||||
}
|
|
||||||
if (specifier === "../apps/api/node_modules/@prisma/client") {
|
|
||||||
return prismaClientModule;
|
|
||||||
}
|
|
||||||
return nativeRequire(specifier);
|
|
||||||
};
|
|
||||||
|
|
||||||
const context = createContext({
|
|
||||||
module,
|
|
||||||
exports: module.exports,
|
|
||||||
require: requireFromScript,
|
|
||||||
__dirname: path.dirname(scriptPath),
|
|
||||||
__filename: scriptPath,
|
|
||||||
console,
|
|
||||||
process: processMock,
|
|
||||||
setTimeout,
|
|
||||||
clearTimeout,
|
|
||||||
setInterval,
|
|
||||||
clearInterval,
|
|
||||||
Buffer,
|
|
||||||
});
|
|
||||||
|
|
||||||
new Script(transpiled.outputText, { filename: scriptPath }).runInContext(context);
|
|
||||||
|
|
||||||
const exported = module.exports as { __test?: ScriptInternals };
|
|
||||||
if (!exported.__test) {
|
|
||||||
throw new Error("Failed to expose migrate-brain internals for tests");
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
internals: exported.__test,
|
|
||||||
readdirMock,
|
|
||||||
readFileMock,
|
|
||||||
prismaClientConstructor,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
vi.restoreAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("migrate-brain mapping helpers", () => {
|
|
||||||
it("maps statuses and priorities, including unknown-value fallbacks", () => {
|
|
||||||
const { internals } = loadMigrateBrainModule();
|
|
||||||
|
|
||||||
expect(internals.mapTaskStatus("done")).toEqual({
|
|
||||||
status: "COMPLETED",
|
|
||||||
issue: null,
|
|
||||||
});
|
|
||||||
expect(internals.mapTaskStatus("mystery")).toEqual({
|
|
||||||
status: "NOT_STARTED",
|
|
||||||
issue: 'Unknown task status "mystery" mapped to NOT_STARTED',
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(internals.mapTaskPriority("critical")).toEqual({
|
|
||||||
priority: "HIGH",
|
|
||||||
issue: null,
|
|
||||||
});
|
|
||||||
expect(internals.mapTaskPriority(null)).toEqual({
|
|
||||||
priority: "MEDIUM",
|
|
||||||
issue: 'Unknown task priority "null" mapped to MEDIUM',
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(internals.mapProjectStatus("in-progress")).toEqual({
|
|
||||||
status: "ACTIVE",
|
|
||||||
issue: null,
|
|
||||||
});
|
|
||||||
expect(internals.mapProjectStatus("untracked")).toEqual({
|
|
||||||
status: "PLANNING",
|
|
||||||
issue: 'Unknown project status "untracked" mapped to PLANNING',
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("normalizes domain strings into lowercase slugs", () => {
|
|
||||||
const { internals } = loadMigrateBrainModule();
|
|
||||||
|
|
||||||
expect(internals.normalizeDomain(" Platform Core ")).toBe("platform-core");
|
|
||||||
expect(internals.normalizeDomain("###")).toBeNull();
|
|
||||||
expect(internals.normalizeDomain(undefined)).toBeNull();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("migrate-brain CLI parsing", () => {
|
|
||||||
it("parses required arguments and default brain path", () => {
|
|
||||||
const { internals } = loadMigrateBrainModule({ homeDirectory: "/opt/home" });
|
|
||||||
|
|
||||||
const parsed = internals.parseCliArgs([
|
|
||||||
"--workspace-id",
|
|
||||||
"workspace-abc",
|
|
||||||
"--user-id",
|
|
||||||
"user-xyz",
|
|
||||||
]);
|
|
||||||
|
|
||||||
expect(parsed).toEqual({
|
|
||||||
brainPath: path.resolve("/opt/home/src/jarvis-brain"),
|
|
||||||
workspaceId: "workspace-abc",
|
|
||||||
userId: "user-xyz",
|
|
||||||
apply: false,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("supports inline flags and apply mode", () => {
|
|
||||||
const { internals } = loadMigrateBrainModule({ homeDirectory: "/opt/home" });
|
|
||||||
|
|
||||||
const parsed = internals.parseCliArgs([
|
|
||||||
"--brain-path=~/custom-brain",
|
|
||||||
"--workspace-id=workspace-1",
|
|
||||||
"--user-id=user-1",
|
|
||||||
"--apply",
|
|
||||||
]);
|
|
||||||
|
|
||||||
expect(parsed).toEqual({
|
|
||||||
brainPath: path.resolve("/opt/home/custom-brain"),
|
|
||||||
workspaceId: "workspace-1",
|
|
||||||
userId: "user-1",
|
|
||||||
apply: true,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it("throws on missing required flags and unknown flags", () => {
|
|
||||||
const { internals } = loadMigrateBrainModule();
|
|
||||||
|
|
||||||
expect(() => internals.parseCliArgs(["--workspace-id", "workspace-1"])).toThrowError(
|
|
||||||
"Both --workspace-id and --user-id are required"
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(() =>
|
|
||||||
internals.parseCliArgs(["--workspace-id", "workspace-1", "--user-id", "user-1", "--nope"])
|
|
||||||
).toThrowError("Unknown flag: --nope");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("migrate-brain file discovery", () => {
|
|
||||||
it("returns only .json files in sorted order", async () => {
|
|
||||||
const readdirImpl = async (): Promise<MockDirent[]> => [
|
|
||||||
makeDirent("z.json", true),
|
|
||||||
makeDirent("notes.md", true),
|
|
||||||
makeDirent("nested", false),
|
|
||||||
makeDirent("a.json", true),
|
|
||||||
];
|
|
||||||
|
|
||||||
const { internals, readdirMock } = loadMigrateBrainModule({ readdirImpl });
|
|
||||||
|
|
||||||
const files = await internals.listJsonFiles("/tmp/brain/data/tasks");
|
|
||||||
|
|
||||||
expect(files).toEqual([
|
|
||||||
path.join("/tmp/brain/data/tasks", "a.json"),
|
|
||||||
path.join("/tmp/brain/data/tasks", "z.json"),
|
|
||||||
]);
|
|
||||||
expect(readdirMock).toHaveBeenCalledWith("/tmp/brain/data/tasks", {
|
|
||||||
withFileTypes: true,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("migrate-brain parsing and validation", () => {
|
|
||||||
it("loads task files and tracks validation issues for invalid task records", async () => {
|
|
||||||
const taskDirectory = "/tmp/brain/data/tasks";
|
|
||||||
const taskFilePath = path.join(taskDirectory, "core.json");
|
|
||||||
|
|
||||||
const readdirImpl = async (): Promise<MockDirent[]> => [makeDirent("core.json", true)];
|
|
||||||
const readFileImpl = async (filePath: string): Promise<string> => {
|
|
||||||
if (filePath === taskFilePath) {
|
|
||||||
return JSON.stringify({
|
|
||||||
version: "1",
|
|
||||||
domain: "core",
|
|
||||||
tasks: [{ id: "TASK-1", title: "Valid" }, { id: "TASK-2" }],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new Error(`Unexpected file read: ${filePath}`);
|
|
||||||
};
|
|
||||||
|
|
||||||
const { internals, readFileMock } = loadMigrateBrainModule({
|
|
||||||
readdirImpl,
|
|
||||||
readFileImpl,
|
|
||||||
});
|
|
||||||
|
|
||||||
const parseIssues: string[] = [];
|
|
||||||
const loaded = await internals.loadTaskFiles(taskDirectory, parseIssues, "/tmp/brain");
|
|
||||||
|
|
||||||
expect(loaded).toHaveLength(1);
|
|
||||||
expect(loaded[0]).toMatchObject({
|
|
||||||
version: "1",
|
|
||||||
domain: "core",
|
|
||||||
sourceFile: path.join("data", "tasks", "core.json"),
|
|
||||||
});
|
|
||||||
expect(loaded[0].tasks).toHaveLength(1);
|
|
||||||
expect(parseIssues).toContain(
|
|
||||||
'data/tasks/core.json task[1]: required field "title" missing or invalid'
|
|
||||||
);
|
|
||||||
expect(readFileMock).toHaveBeenCalledWith(taskFilePath, "utf8");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("rejects invalid project payloads", () => {
|
|
||||||
const { internals } = loadMigrateBrainModule();
|
|
||||||
|
|
||||||
const parseIssues: string[] = [];
|
|
||||||
const parsed = internals.parseProjectFile(
|
|
||||||
{
|
|
||||||
version: "1",
|
|
||||||
project: {
|
|
||||||
name: "Project without ID",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"data/projects/project.json",
|
|
||||||
parseIssues
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(parsed).toBeNull();
|
|
||||||
expect(parseIssues).toContain(
|
|
||||||
'data/projects/project.json project: required field "id" missing or invalid'
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("migrate-brain dry-run behavior", () => {
|
|
||||||
it("does not instantiate Prisma client when --apply is omitted", async () => {
|
|
||||||
const brainPath = "/tmp/brain";
|
|
||||||
const readdirImpl = async (): Promise<MockDirent[]> => [];
|
|
||||||
|
|
||||||
const { internals, prismaClientConstructor, readdirMock } = loadMigrateBrainModule({
|
|
||||||
argv: [
|
|
||||||
"node",
|
|
||||||
scriptPath,
|
|
||||||
"--brain-path",
|
|
||||||
brainPath,
|
|
||||||
"--workspace-id",
|
|
||||||
"workspace-1",
|
|
||||||
"--user-id",
|
|
||||||
"user-1",
|
|
||||||
],
|
|
||||||
readdirImpl,
|
|
||||||
});
|
|
||||||
|
|
||||||
const logSpy = vi.spyOn(console, "log").mockImplementation(() => undefined);
|
|
||||||
|
|
||||||
await internals.main();
|
|
||||||
|
|
||||||
expect(prismaClientConstructor).not.toHaveBeenCalled();
|
|
||||||
expect(readdirMock).toHaveBeenCalledWith(path.join(brainPath, "data", "tasks"), {
|
|
||||||
withFileTypes: true,
|
|
||||||
});
|
|
||||||
expect(readdirMock).toHaveBeenCalledWith(path.join(brainPath, "data", "projects"), {
|
|
||||||
withFileTypes: true,
|
|
||||||
});
|
|
||||||
expect(logSpy).toHaveBeenCalledWith("Dry-run complete. Re-run with --apply to write records.");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
Reference in New Issue
Block a user