Merge branch 'canary' into feat/cloud

This commit is contained in:
Mauricio Siu
2024-10-07 00:31:23 -06:00
4 changed files with 97 additions and 9 deletions

View File

@@ -132,6 +132,7 @@ export const projectRouter = createTRPCRouter({
applications.applicationId,
accesedServices,
),
with: { domains: true },
},
mariadb: {
where: buildServiceFilter(mariadb.mariadbId, accesedServices),
@@ -150,6 +151,7 @@ export const projectRouter = createTRPCRouter({
},
compose: {
where: buildServiceFilter(compose.composeId, accesedServices),
with: { domains: true },
},
},
orderBy: desc(projects.createdAt),
@@ -160,13 +162,21 @@ export const projectRouter = createTRPCRouter({
return await db.query.projects.findMany({
with: {
applications: true,
applications: {
with: {
domains: true,
},
},
mariadb: true,
mongo: true,
mysql: true,
postgres: true,
redis: true,
compose: true,
compose: {
with: {
domains: true,
},
},
},
where: eq(projects.adminId, ctx.user.adminId),
orderBy: desc(projects.createdAt),