Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ff3f6f7
refactor: enhance EmployeeCompletionChart with profile links
Marfuen Aug 26, 2025
50222fa
Merge pull request #1411 from trycompai/mariano/new-agent
Marfuen Aug 26, 2025
8a81f42
fix: Enforce role-based access control in app
Dhanus3133 Aug 26, 2025
a9957cd
fix: Prisma seed command in `packages/db`
Dhanus3133 Aug 26, 2025
d7ac38b
Merge pull request #1414 from Dhanus3133/fix/prisma-seed-command
Marfuen Aug 27, 2025
f8700e9
Merge branch 'main' into fix/deny-access-non-owners-and-non-admin
Dhanus3133 Aug 27, 2025
a4056bf
fix: Move role checks on org level
Dhanus3133 Aug 27, 2025
237a1fc
Merge branch 'fix/deny-access-non-owners-and-non-admin' of https://gi…
Dhanus3133 Aug 27, 2025
1553400
fix: Allow access to auditor role
Dhanus3133 Aug 27, 2025
bfa18f0
chore: Just restrict access to employee role
Dhanus3133 Aug 27, 2025
4bedd51
Merge pull request #1413 from Dhanus3133/fix/deny-access-non-owners-a…
Marfuen Aug 27, 2025
f16ad2f
chore(deps): bump @tiptap/extension-highlight from 2.22.3 to 3.3.0 (#…
dependabot[bot] Aug 28, 2025
ee901ab
chore(deps): bump dub from 0.63.7 to 0.66.1 (#1399)
dependabot[bot] Aug 28, 2025
0740452
chore(deps): bump @dub/embed-react from 0.0.15 to 0.0.16 (#1337)
dependabot[bot] Aug 28, 2025
dd928ad
chore: update Header component and enhance NoAccess page layout (#1425)
github-actions[bot] Aug 28, 2025
9035238
fix: remove duplicate dependsOn key (#1426)
golamrabbiazad Aug 28, 2025
abedc9a
[dev] [Marfuen] mariano/videos (#1427)
github-actions[bot] Aug 28, 2025
1a3b08d
[dev] [Marfuen] mariano/fix-bug (#1429)
github-actions[bot] Aug 28, 2025
a717403
Mariano/updated employees (#1430)
Marfuen Aug 28, 2025
98c6503
chore: remove training video backfill action and related documentatio…
github-actions[bot] Aug 28, 2025
2691ce8
[dev] [Marfuen] mariano/batch (#1432)
github-actions[bot] Aug 28, 2025
3fe72a9
show loader while marking video as complete (#1437)
github-actions[bot] Aug 29, 2025
af81122
Merge branch 'release' into main
Marfuen Aug 29, 2025
21cd3af
chore(deps): bump @radix-ui/react-popover from 1.1.14 to 1.1.15 (#1434)
dependabot[bot] Aug 29, 2025
460b72d
chore(deps): bump embla-carousel-react from 8.5.1 to 8.6.0 (#1436)
dependabot[bot] Aug 29, 2025
b85c277
chore(deps-dev): bump eslint-config-next from 15.4.2-canary.16 to 15.…
dependabot[bot] Aug 29, 2025
4b90703
Merge branch 'release' into main
Marfuen Aug 29, 2025
0801b32
[dev] [Marfuen] mariano/docker-fix (#1440)
github-actions[bot] Aug 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ RUN echo '{"name":"migrator","type":"module","dependencies":{"prisma":"^6.14.0",
# Install ONLY Prisma dependencies
RUN bun install

# Ensure Prisma can find migrations relative to the published schema path
# We copy the local migrations into the published package's dist directory
RUN cp -R packages/db/prisma/migrations node_modules/@trycompai/db/dist/

# Run migrations against the combined schema published by @trycompai/db
RUN echo "Running migrations against @trycompai/db combined schema"
CMD ["bunx", "prisma", "migrate", "deploy", "--schema=node_modules/@trycompai/db/dist/schema.prisma"]
Expand Down
2 changes: 1 addition & 1 deletion apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"@vitejs/plugin-react": "^4.6.0",
"@vitest/ui": "^3.2.4",
"eslint": "^9.18.0",
"eslint-config-next": "15.4.2-canary.16",
"eslint-config-next": "15.5.2",
"fleetctl": "^4.68.1",
"glob": "^11.0.3",
"jsdom": "^26.1.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/portal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@types/archiver": "^6.0.3",
"@types/node": "^24.0.3",
"eslint": "^9.18.0",
"eslint-config-next": "15.4.2-canary.16",
"eslint-config-next": "15.5.2",
"postcss": "^8.5.4",
"tailwindcss": "^4.1.8",
"typescript": "^5.8.3"
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ services:
dockerfile: Dockerfile
target: migrator
env_file:
- .env
- packages/db/.env
seeder:
build:
context: .
dockerfile: Dockerfile
target: migrator
env_file:
- .env
- packages/db/.env
command: sh -lc "bunx prisma generate --schema=node_modules/@trycompai/db/dist/schema.prisma && bun packages/db/prisma/seed/seed.js"
app:
build:
Expand All @@ -24,7 +24,7 @@ services:
ports:
- '3000:3000'
env_file:
- .env
- apps/app/.env
healthcheck:
test: ['CMD-SHELL', 'curl -f http://localhost:3000/api/health || exit 1']
interval: 30s
Expand All @@ -42,7 +42,7 @@ services:
ports:
- '3002:3000'
env_file:
- .env
- apps/portal/.env
healthcheck:
test: ['CMD-SHELL', 'curl -f http://localhost:3002/ || exit 1']
interval: 30s
Expand Down
11 changes: 11 additions & 0 deletions packages/db/prisma/seed/seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ async function seedJsonFiles(subDirectory: string) {
const files = await fs.readdir(directoryPath);
const jsonFiles = files.filter((file) => file.endsWith('.json'));

// Ensure deterministic order for primitives so FK dependencies are satisfied
// Specifically, seed Frameworks before Requirements (which reference Frameworks)
if (subDirectory === 'primitives') {
const priorityOrder = ['FrameworkEditorFramework.json'];
const getPriority = (fileName: string) => {
const index = priorityOrder.indexOf(fileName);
return index === -1 ? Number.MAX_SAFE_INTEGER : index;
};
jsonFiles.sort((a, b) => getPriority(a) - getPriority(b));
}

for (const jsonFile of jsonFiles) {
try {
const filePath = path.join(directoryPath, jsonFile);
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "2.1.7",
"@radix-ui/react-navigation-menu": "1.2.13",
"@radix-ui/react-popover": "1.1.14",
"@radix-ui/react-popover": "1.1.15",
"@radix-ui/react-progress": "1.1.7",
"@radix-ui/react-radio-group": "1.3.7",
"@radix-ui/react-scroll-area": "1.2.9",
Expand Down Expand Up @@ -61,7 +61,7 @@
"clsx": "^2.1.1",
"cmdk": "1.0.4",
"date-fns": "^4.1.0",
"embla-carousel-react": "8.5.1",
"embla-carousel-react": "8.6.0",
"input-otp": "1.4.2",
"jsonfile": "^6.1.0",
"lucide-react": "^0.534.0",
Expand Down
Loading