From 4bdb56c6cb53acecea7f7431580990e094f2b6cb Mon Sep 17 00:00:00 2001 From: Gil Glick Date: Sun, 8 Mar 2026 20:02:14 -0400 Subject: [PATCH 1/4] #3926 subteam projects --- src/backend/src/prisma-query-args/teams.query-args.ts | 3 ++- src/backend/src/transformers/teams.transformer.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/backend/src/prisma-query-args/teams.query-args.ts b/src/backend/src/prisma-query-args/teams.query-args.ts index e8c80742a9..200c155f3c 100644 --- a/src/backend/src/prisma-query-args/teams.query-args.ts +++ b/src/backend/src/prisma-query-args/teams.query-args.ts @@ -30,6 +30,7 @@ export const getTeamPreviewQueryArgs = (organizationId: string) => include: { members: getUserQueryArgs(organizationId), head: getUserQueryArgs(organizationId), - leads: getUserQueryArgs(organizationId) + leads: getUserQueryArgs(organizationId), + teamType: true } }); diff --git a/src/backend/src/transformers/teams.transformer.ts b/src/backend/src/transformers/teams.transformer.ts index 5c75bc725f..46a6b7d62f 100644 --- a/src/backend/src/transformers/teams.transformer.ts +++ b/src/backend/src/transformers/teams.transformer.ts @@ -26,7 +26,8 @@ export const teamPreviewTransformer = (team: Prisma.TeamGetPayload Date: Wed, 18 Mar 2026 16:46:38 -0400 Subject: [PATCH 2/4] created team-type.query-args.ts to limit preview information for team types --- .../prisma-query-args/team-type.query-args.ts | 18 ++++++++++++++++++ .../src/prisma-query-args/teams.query-args.ts | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/backend/src/prisma-query-args/team-type.query-args.ts diff --git a/src/backend/src/prisma-query-args/team-type.query-args.ts b/src/backend/src/prisma-query-args/team-type.query-args.ts new file mode 100644 index 0000000000..d286302e73 --- /dev/null +++ b/src/backend/src/prisma-query-args/team-type.query-args.ts @@ -0,0 +1,18 @@ +import { Prisma } from '@prisma/client'; + +export type TeamTypeQueryArgs = ReturnType; +export type TeamTypePreviewQueryArgs = ReturnType; + +export const getTeamTypeQueryArgs = () => + Prisma.validator()({ + select: { + name: true + } + }); + +export const getTeamTypePreviewQueryArgs = () => + Prisma.validator()({ + select: { + name: true + } + }); diff --git a/src/backend/src/prisma-query-args/teams.query-args.ts b/src/backend/src/prisma-query-args/teams.query-args.ts index 200c155f3c..0bb1cf91a8 100644 --- a/src/backend/src/prisma-query-args/teams.query-args.ts +++ b/src/backend/src/prisma-query-args/teams.query-args.ts @@ -1,6 +1,7 @@ import { Prisma } from '@prisma/client'; import { getUserQueryArgs } from './user.query-args.js'; import { getProjectGanttQueryArgs } from './projects.query-args.js'; +import { getTeamTypeQueryArgs } from './team-type.query-args.js'; export type TeamQueryArgs = ReturnType; @@ -31,6 +32,6 @@ export const getTeamPreviewQueryArgs = (organizationId: string) => members: getUserQueryArgs(organizationId), head: getUserQueryArgs(organizationId), leads: getUserQueryArgs(organizationId), - teamType: true + teamType: getTeamTypeQueryArgs() } }); From 5f719fb5df8b08fa36b28ba7f0ec317b8f713797 Mon Sep 17 00:00:00 2001 From: Gil Glick Date: Wed, 18 Mar 2026 22:23:50 -0400 Subject: [PATCH 3/4] removed the team type query args and put it in team query args --- .../prisma-query-args/team-type.query-args.ts | 18 ------------------ .../src/prisma-query-args/teams.query-args.ts | 10 ++++++++-- 2 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 src/backend/src/prisma-query-args/team-type.query-args.ts diff --git a/src/backend/src/prisma-query-args/team-type.query-args.ts b/src/backend/src/prisma-query-args/team-type.query-args.ts deleted file mode 100644 index d286302e73..0000000000 --- a/src/backend/src/prisma-query-args/team-type.query-args.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Prisma } from '@prisma/client'; - -export type TeamTypeQueryArgs = ReturnType; -export type TeamTypePreviewQueryArgs = ReturnType; - -export const getTeamTypeQueryArgs = () => - Prisma.validator()({ - select: { - name: true - } - }); - -export const getTeamTypePreviewQueryArgs = () => - Prisma.validator()({ - select: { - name: true - } - }); diff --git a/src/backend/src/prisma-query-args/teams.query-args.ts b/src/backend/src/prisma-query-args/teams.query-args.ts index 0bb1cf91a8..4b90848281 100644 --- a/src/backend/src/prisma-query-args/teams.query-args.ts +++ b/src/backend/src/prisma-query-args/teams.query-args.ts @@ -1,7 +1,6 @@ import { Prisma } from '@prisma/client'; import { getUserQueryArgs } from './user.query-args.js'; import { getProjectGanttQueryArgs } from './projects.query-args.js'; -import { getTeamTypeQueryArgs } from './team-type.query-args.js'; export type TeamQueryArgs = ReturnType; @@ -14,7 +13,7 @@ export const getTeamQueryArgs = (organizationId: string) => head: getUserQueryArgs(organizationId), leads: getUserQueryArgs(organizationId), userArchived: getUserQueryArgs(organizationId), - teamType: true, + teamType: getTeamTypeQueryArgs(), projects: { where: { wbsElement: { @@ -35,3 +34,10 @@ export const getTeamPreviewQueryArgs = (organizationId: string) => teamType: getTeamTypeQueryArgs() } }); + +export const getTeamTypeQueryArgs = () => + Prisma.validator()({ + select: { + name: true + } + }); From 5b6f8d88a79cfa55d0f7a9796d4fb8d6e3e31e6b Mon Sep 17 00:00:00 2001 From: Gil Glick Date: Thu, 19 Mar 2026 19:01:59 -0400 Subject: [PATCH 4/4] made the bare minimum changes from the first commit --- .../src/prisma-query-args/teams.query-args.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/backend/src/prisma-query-args/teams.query-args.ts b/src/backend/src/prisma-query-args/teams.query-args.ts index 4b90848281..3b41eabf4e 100644 --- a/src/backend/src/prisma-query-args/teams.query-args.ts +++ b/src/backend/src/prisma-query-args/teams.query-args.ts @@ -13,7 +13,11 @@ export const getTeamQueryArgs = (organizationId: string) => head: getUserQueryArgs(organizationId), leads: getUserQueryArgs(organizationId), userArchived: getUserQueryArgs(organizationId), - teamType: getTeamTypeQueryArgs(), + teamType: { + select: { + name: true + } + }, projects: { where: { wbsElement: { @@ -31,13 +35,10 @@ export const getTeamPreviewQueryArgs = (organizationId: string) => members: getUserQueryArgs(organizationId), head: getUserQueryArgs(organizationId), leads: getUserQueryArgs(organizationId), - teamType: getTeamTypeQueryArgs() - } - }); - -export const getTeamTypeQueryArgs = () => - Prisma.validator()({ - select: { - name: true + teamType: { + select: { + name: true + } + } } });