Merge pull request #1560 from ever-co/fix/project-team-mapping

Project-Team mapping
ever-co · Oct 16, 2023 · b410587 · b410587
2 parents 8e1c259 + 594b94f
commit b410587
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 4 deletions.
diff --git a/apps/web/app/constants.ts b/apps/web/app/constants.ts
@@ -25,6 +25,7 @@ export const ORGANIZATION_ID_COOKIE_NAME = 'auth-organization-id';
 export const ACTIVE_LANGUAGE_COOKIE_NAME = 'auth-active-language';
 export const ACTIVE_TIMEZONE_COOKIE_NAME = 'auth-timezone';
 export const NO_TEAM_POPUP_SHOW_COOKIE_NAME = 'no-team-popup-show';
+export const ACTIVE_PROJECT_COOKIE_NAME = 'auth-active-project';
 
 // Recaptcha
 export const RECAPTCHA_SITE_KEY = process.env.NEXT_PUBLIC_CAPTCHA_SITE_KEY;

diff --git a/apps/web/app/helpers/cookies/index.ts b/apps/web/app/helpers/cookies/index.ts
@@ -10,7 +10,8 @@ import {
 	ACTIVE_USER_TASK_COOKIE_NAME,
 	NO_TEAM_POPUP_SHOW_COOKIE_NAME,
 	ACTIVE_USER_ID_COOKIE_NAME,
-	MEET_JWT_TOKEN_COOKIE_NAME
+	MEET_JWT_TOKEN_COOKIE_NAME,
+	ACTIVE_PROJECT_COOKIE_NAME
 } from '@app/constants';
 import { IDecodedRefreshToken } from '@app/interfaces/IAuthentication';
 import { deleteCookie, getCookie, setCookie } from './helpers';
@@ -180,6 +181,15 @@ export function setActiveTeamIdCookie(teamIds: string, ctx?: NextCtx) {
 	return setCookie(ACTIVE_TEAM_COOKIE_NAME, teamIds, { ...(ctx || {}) });
 }
 
+// Active Project id
+export function getActiveProjectIdCookie(ctx?: NextCtx) {
+	return getCookie(ACTIVE_PROJECT_COOKIE_NAME, { ...(ctx || {}) }) as string;
+}
+
+export function setActiveProjectIdCookie(teamIds: string, ctx?: NextCtx) {
+	return setCookie(ACTIVE_PROJECT_COOKIE_NAME, teamIds, { ...(ctx || {}) });
+}
+
 // Organization Id
 export function getOrganizationIdCookie(ctx: NextCtx) {
 	return getCookie(ORGANIZATION_ID_COOKIE_NAME, { ...ctx }) as string;

diff --git a/apps/web/app/hooks/features/useOrganizationTeams.ts b/apps/web/app/hooks/features/useOrganizationTeams.ts
@@ -1,5 +1,6 @@
 import {
 	getActiveTeamIdCookie,
+	setActiveProjectIdCookie,
 	setActiveTeamIdCookie,
 	setOrganizationIdCookie
 } from '@app/helpers/cookies';
@@ -239,6 +240,12 @@ export function useOrganizationTeams() {
 			setOrganizationIdCookie(team.organizationId);
 			// This must be called at the end (Update store)
 			setActiveTeamId(team.id);
+
+			// Set Project Id to cookie
+			// TODO: Make it dynamic when we add Dropdown in Navbar
+			if (team && team.projects && team.projects.length) {
+				setActiveProjectIdCookie(team.projects[0].id);
+			}
 		},
 		[setActiveTeamId]
 	);
@@ -297,6 +304,12 @@ export function useOrganizationTeams() {
 							newTeam,
 							...latestTeams.filter((team) => team.id !== newTeam.id)
 						]);
+
+						// Set Project Id to cookie
+						// TODO: Make it dynamic when we add Dropdown in Navbar
+						if (newTeam && newTeam.projects && newTeam.projects.length) {
+							setActiveProjectIdCookie(newTeam.projects[0].id);
+						}
 					}
 				});
 			return res;

diff --git a/apps/web/app/hooks/features/useTeamTasks.ts b/apps/web/app/hooks/features/useTeamTasks.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-mixed-spaces-and-tabs */
 import {
 	getActiveTaskIdCookie,
 	getActiveUserTaskCookie,
@@ -224,14 +225,21 @@ export function useTeamTasks() {
 				priority,
 				size,
 				tags,
+				// Set Project Id to cookie
+				// TODO: Make it dynamic when we add Dropdown in Navbar
+				...(activeTeam?.projects && activeTeam?.projects.length > 0
+					? {
+							projectId: activeTeam.projects[0].id
+					  }
+					: {}),
 				...(description ? { description: `<p>${description}</p>` } : {}),
 				...(members ? { members } : {})
 			}).then((res) => {
 				deepCheckAndUpdateTasks(res?.data?.items || [], true);
 				return res;
 			});
 		},
-		[createQueryCall, deepCheckAndUpdateTasks]
+		[createQueryCall, deepCheckAndUpdateTasks, activeTeam]
 	);
 
 	const updateTask = useCallback(

diff --git a/apps/web/app/interfaces/IOrganizationTeam.ts b/apps/web/app/interfaces/IOrganizationTeam.ts
@@ -59,6 +59,7 @@ export interface IOrganizationTeamList {
 	profile_link?: string;
 	imageId?: string | null;
 	image?: IImageAssets | null;
+	projects?: IProject[];
 }
 
 export type IOrganizationTeamWithMStatus = IOrganizationTeamList;

diff --git a/apps/web/app/interfaces/ITask.ts b/apps/web/app/interfaces/ITask.ts
@@ -169,6 +169,7 @@ export interface ICreateTask {
 	estimate: number;
 	organizationId: string;
 	tenantId: string;
+	projectId?: string | null;
 }
 
 export interface ITaskLinkedIssue {

diff --git a/apps/web/app/services/server/guards/authenticated-guard.ts b/apps/web/app/services/server/guards/authenticated-guard.ts
@@ -1,5 +1,6 @@
 import {
 	getAccessTokenCookie,
+	getActiveProjectIdCookie,
 	getActiveTaskIdCookie,
 	getActiveTeamIdCookie,
 	getOrganizationIdCookie,
@@ -17,6 +18,7 @@ export async function authenticatedGuard(
 	const organizationId = getOrganizationIdCookie({ req, res });
 	const teamId = getActiveTeamIdCookie({ req, res });
 	const taskId = getActiveTaskIdCookie({ req, res });
+	const projectId = getActiveProjectIdCookie({ req, res });
 
 	const r_res = await currentAuthenticatedUserRequest({
 		bearer_token: access_token?.toString() || ''
@@ -39,6 +41,7 @@ export async function authenticatedGuard(
 		tenantId,
 		organizationId,
 		teamId,
-		taskId
+		taskId,
+		projectId
 	};
 }
diff --git a/apps/web/app/services/server/requests/tasks.ts b/apps/web/app/services/server/requests/tasks.ts
@@ -11,6 +11,8 @@ import { IUser } from '@app/interfaces';
 export function getTeamTasksRequest({
 	tenantId,
 	organizationId,
+	// TODO
+	// projectId,
 	bearer_token,
 	relations = [
 		'tags',
@@ -29,10 +31,13 @@ export function getTeamTasksRequest({
 	organizationId: string;
 	bearer_token: string;
 	relations?: string[];
+	projectId?: string;
 }) {
 	const obj = {
 		'where[organizationId]': organizationId,
 		'where[tenantId]': tenantId,
+		// TODO
+		// 'where[projectId]': projectId,
 		'join[alias]': 'task',
 		'join[leftJoinAndSelect][members]': 'task.members',
 		'join[leftJoinAndSelect][user]': 'members.user'

diff --git a/apps/web/pages/api/tasks/team.ts b/apps/web/pages/api/tasks/team.ts
@@ -10,7 +10,7 @@ export default async function handler(
 	req: NextApiRequest,
 	res: NextApiResponse
 ) {
-	const { $res, user, tenantId, organizationId, access_token } =
+	const { $res, user, tenantId, organizationId, access_token, projectId } =
 		await authenticatedGuard(req, res);
 	if (!user) return $res();
 
@@ -37,6 +37,7 @@ export default async function handler(
 				tags: [],
 				organizationId,
 				tenantId,
+				projectId,
 				estimate: 0,
 				...body,
 				title // this must be called after ...body
@@ -47,6 +48,7 @@ export default async function handler(
 	const { data: tasks } = await getTeamTasksRequest({
 		tenantId,
 		organizationId,
+		projectId,
 		bearer_token: access_token
 	});