Merge pull request #3052 from ever-co/develop

Stage
ever-co · Sep 19, 2024 · 0a0f1f1 · 0a0f1f1
2 parents 68082e0 + bbeae2e
commit 0a0f1f1
Show file tree

Hide file tree

Showing 20 changed files with 451 additions and 248 deletions.
diff --git a/apps/web/app/api/daily-plan/[id]/route.ts b/apps/web/app/api/daily-plan/[id]/route.ts
@@ -10,14 +10,22 @@ export async function GET(req: Request, { params }: INextParams) {
 		return;
 	}
 
-	const { $res, user, tenantId, organizationId, access_token } = await authenticatedGuard(req, res);
+	const {
+		$res,
+		user,
+		tenantId,
+		organizationId,
+		teamId: organizationTeamId,
+		access_token
+	} = await authenticatedGuard(req, res);
 	if (!user) return $res('Unauthorized');
 
 	const response = await getDayPlansByEmployee({
 		bearer_token: access_token,
 		employeeId: id,
 		organizationId,
-		tenantId
+		tenantId,
+		organizationTeamId
 	});
 
 	return $res(response.data);

diff --git a/apps/web/app/api/daily-plan/me/route.ts b/apps/web/app/api/daily-plan/me/route.ts
@@ -5,14 +5,22 @@ import { NextResponse } from 'next/server';
 export async function GET(req: Request) {
 	const res = new NextResponse();
 
-	const { $res, user, tenantId, organizationId, access_token } = await authenticatedGuard(req, res);
+	const {
+		$res,
+		user,
+		tenantId,
+		organizationId,
+		teamId: organizationTeamId,
+		access_token
+	} = await authenticatedGuard(req, res);
 
 	if (!user) return $res('Unauthorized');
 
 	const response = await getMyDailyPlansRequest({
 		bearer_token: access_token,
 		organizationId,
-		tenantId
+		tenantId,
+		organizationTeamId
 	});
 
 	return $res(response.data);

diff --git a/apps/web/app/api/daily-plan/route.ts b/apps/web/app/api/daily-plan/route.ts
@@ -19,13 +19,21 @@ export async function POST(req: Request) {
 export async function GET(req: Request) {
 	const res = new NextResponse();
 
-	const { $res, user, tenantId, organizationId, access_token } = await authenticatedGuard(req, res);
+	const {
+		$res,
+		user,
+		tenantId,
+		organizationId,
+		teamId: organizationTeamId,
+		access_token
+	} = await authenticatedGuard(req, res);
 	if (!user) return $res('Unauthorized');
 
 	const response = await getAllDayPlans({
 		bearer_token: access_token,
 		organizationId,
-		tenantId
+		tenantId,
+		organizationTeamId
 	});
 
 	return $res(response.data);

diff --git a/apps/web/app/api/daily-plan/task/[taskId]/route.ts b/apps/web/app/api/daily-plan/task/[taskId]/route.ts
@@ -10,15 +10,23 @@ export async function GET(req: Request, { params }: INextParams) {
 		return;
 	}
 
-	const { $res, user, tenantId, organizationId, access_token } = await authenticatedGuard(req, res);
+	const {
+		$res,
+		user,
+		tenantId,
+		organizationId,
+		teamId: organizationTeamId,
+		access_token
+	} = await authenticatedGuard(req, res);
 
 	if (!user) return $res('Unauthorized');
 
 	const response = await getPlansByTask({
 		taskId,
 		bearer_token: access_token,
 		organizationId,
-		tenantId
+		tenantId,
+		organizationTeamId
 	});
 
 	return $res(response.data);

diff --git a/apps/web/app/constants.ts b/apps/web/app/constants.ts
@@ -284,6 +284,8 @@ export const DAILY_PLAN_SUGGESTION_MODAL_DATE = 'daily-plan-suggestion-modal-dat
 export const TASKS_ESTIMATE_HOURS_MODAL_DATE = 'tasks-estimate-hours-modal-date';
 export const DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE = 'daily-plan-estimate-hours-modal';
 export const DEFAULT_PLANNED_TASK_ID = 'default-planned-task-id';
+export const LAST_OPTION__CREATE_DAILY_PLAN_MODAL = 'last-option--create-daily-plan-modal';
+export const HAS_VISITED_OUTSTANDING_TAB = 'has-visited-outstanding-tab';
 
 // OAuth provider's keys
 

diff --git a/apps/web/app/hooks/features/useAuthTeamTasks.ts b/apps/web/app/hooks/features/useAuthTeamTasks.ts
@@ -29,7 +29,7 @@ export function useAuthTeamTasks(user: IUser | undefined) {
 
 	const planned = useMemo(() => {
 		const outStandingTasksCount = estimatedTotalTime(
-			outstandingPlans.map((plan) => plan.tasks?.map((task) => task))
+			outstandingPlans?.map((plan) => plan.tasks?.map((task) => task))
 		).totalTasks;
 
 		const todayTasksCOunt = getTotalTasks(todayPlan);

diff --git a/apps/web/app/hooks/features/useDailyPlan.ts b/apps/web/app/hooks/features/useDailyPlan.ts
@@ -301,6 +301,7 @@ export function useDailyPlan() {
 		);
 	}, [profileDailyPlans]);
 
+
 	const todayTasks = useMemo(() => {
 		return todayPlan
 			.map((plan) => {
@@ -355,8 +356,9 @@ export function useDailyPlan() {
 		if (firstLoad) {
 			getMyDailyPlans();
 			getAllDayPlans();
+			getEmployeeDayPlans(user?.employee.id || '');
 		}
-	}, [getMyDailyPlans, getAllDayPlans, firstLoad]);
+	}, [getMyDailyPlans, activeTeam?.id, getAllDayPlans, firstLoad, getEmployeeDayPlans, user?.employee.id]);
 
 	return {
 		dailyPlan,

diff --git a/apps/web/app/interfaces/index.ts b/apps/web/app/interfaces/index.ts
@@ -33,7 +33,8 @@ export * from './ITheme';
 export * from './IRolePermissions';
 export * from './ITimer';
 export * from './IProject';
-export * from './ILiveKiteCredentials'
+export * from './ILiveKiteCredentials';
+export * from './IBaseModel';
 
 export * from './integrations/IGithubRepositories';
 export * from './integrations/IGithubMetadata';

diff --git a/apps/web/app/services/client/api/daily-plan.ts b/apps/web/app/services/client/api/daily-plan.ts
@@ -3,23 +3,26 @@ import { deleteApi, get, post, put } from '../axios';
 import {
 	DeleteResponse,
 	ICreateDailyPlan,
+	ID,
 	IDailyPlan,
 	IDailyPlanTasksUpdate,
 	IRemoveTaskFromManyPlans,
 	IUpdateDailyPlan,
 	PaginationResponse
 } from '@app/interfaces';
-import { getOrganizationIdCookie, getTenantIdCookie } from '@app/helpers';
+import { getActiveTeamIdCookie, getOrganizationIdCookie, getTenantIdCookie } from '@app/helpers';
 
-export function getAllDayPlansAPI() {
+export function getAllDayPlansAPI(activeTeamId?: ID) {
 	const organizationId = getOrganizationIdCookie();
 	const tenantId = getTenantIdCookie();
+	const organizationTeamId = getActiveTeamIdCookie();
 
 	const relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user'];
 
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': activeTeamId || organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -30,15 +33,17 @@ export function getAllDayPlansAPI() {
 	return get<PaginationResponse<IDailyPlan>>(`/daily-plan?${query}`, { tenantId });
 }
 
-export function getMyDailyPlansAPI() {
+export function getMyDailyPlansAPI(activeTeamId?: ID) {
 	const organizationId = getOrganizationIdCookie();
 	const tenantId = getTenantIdCookie();
+	const organizationTeamId = getActiveTeamIdCookie();
 
 	const relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user'];
 
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': activeTeamId || organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -49,15 +54,17 @@ export function getMyDailyPlansAPI() {
 	return get<PaginationResponse<IDailyPlan>>(`/daily-plan/me?${query}`, { tenantId });
 }
 
-export function getDayPlansByEmployeeAPI(employeeId?: string) {
+export function getDayPlansByEmployeeAPI(employeeId?: string, activeTeamId?: ID) {
 	const organizationId = getOrganizationIdCookie();
 	const tenantId = getTenantIdCookie();
+	const organizationTeamId = getActiveTeamIdCookie();
 
 	const relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user'];
 
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': activeTeamId || organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -71,10 +78,12 @@ export function getDayPlansByEmployeeAPI(employeeId?: string) {
 export function getPlansByTaskAPI(taskId?: string) {
 	const organizationId = getOrganizationIdCookie();
 	const tenantId = getTenantIdCookie();
+	const organizationTeamId = getActiveTeamIdCookie();
 
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': organizationTeamId
 	} as Record<string, string>;
 
 	const query = qs.stringify(obj);
@@ -106,9 +115,9 @@ export function removeTaskFromPlanAPI(data: IDailyPlanTasksUpdate, planId: strin
 	return put<IDailyPlan>(`/daily-plan/${planId}/task`, { ...data, organizationId }, { tenantId });
 }
 
-export function removeManyTaskFromPlansAPI({ taskId, data }: { taskId: string, data: IRemoveTaskFromManyPlans }) {
+export function removeManyTaskFromPlansAPI({ taskId, data }: { taskId: string; data: IRemoveTaskFromManyPlans }) {
 	const organizationId = getOrganizationIdCookie();
-	return put<IDailyPlan[]>(`/daily-plan/${taskId}/remove`, { ...data, organizationId })
+	return put<IDailyPlan[]>(`/daily-plan/${taskId}/remove`, { ...data, organizationId });
 }
 
 export function deleteDailyPlanAPI(planId: string) {

diff --git a/apps/web/app/services/server/requests/daily-plan.ts b/apps/web/app/services/server/requests/daily-plan.ts
@@ -1,22 +1,31 @@
 import qs from 'qs';
-import { ICreateDailyPlan, IDailyPlan, IDailyPlanTasksUpdate, IRemoveTaskFromManyPlans, IUpdateDailyPlan } from '@app/interfaces/IDailyPlan';
+import {
+	ICreateDailyPlan,
+	IDailyPlan,
+	IDailyPlanTasksUpdate,
+	IRemoveTaskFromManyPlans,
+	IUpdateDailyPlan
+} from '@app/interfaces/IDailyPlan';
 import { serverFetch } from '../fetch';
-import { DeleteResponse } from '@app/interfaces';
+import { DeleteResponse, ID } from '@app/interfaces';
 
 export function getAllDayPlans({
 	organizationId,
 	tenantId,
+	organizationTeamId,
 	bearer_token,
 	relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user']
 }: {
-	organizationId: string;
-	tenantId: string;
+	organizationId: ID;
+	tenantId: ID;
+	organizationTeamId: ID;
 	bearer_token: string;
 	relations?: string[];
 }) {
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -35,17 +44,20 @@ export function getAllDayPlans({
 export function getMyDailyPlansRequest({
 	organizationId,
 	tenantId,
+	organizationTeamId,
 	bearer_token,
 	relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user']
 }: {
-	organizationId: string;
-	tenantId: string;
+	organizationId: ID;
+	tenantId: ID;
+	organizationTeamId: ID;
 	bearer_token: string;
 	relations?: string[];
 }) {
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -65,18 +77,21 @@ export function getDayPlansByEmployee({
 	employeeId,
 	organizationId,
 	tenantId,
+	organizationTeamId,
 	bearer_token,
 	relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user']
 }: {
-	employeeId: string;
-	organizationId: string;
-	tenantId: string;
+	employeeId: ID;
+	organizationId: ID;
+	tenantId: ID;
+	organizationTeamId: ID;
 	bearer_token: string;
 	relations?: string[];
 }) {
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -96,16 +111,19 @@ export function getPlansByTask({
 	taskId,
 	organizationId,
 	tenantId,
+	organizationTeamId,
 	bearer_token
 }: {
 	taskId: string;
-	organizationId: string;
-	tenantId: string;
+	organizationId: ID;
+	tenantId: ID;
+	organizationTeamId: ID;
 	bearer_token: string;
 }) {
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': organizationTeamId
 	} as Record<string, string>;
 
 	const query = qs.stringify(obj);
@@ -203,11 +221,19 @@ export function deleteDailyPlanRequest({ planId, bearer_token }: { planId: strin
 	});
 }
 
-export function deleteDailyPlansManyRequest({ bearer_token, taskId, data }: { bearer_token?: string, taskId: string, data: IRemoveTaskFromManyPlans }) {
+export function deleteDailyPlansManyRequest({
+	bearer_token,
+	taskId,
+	data
+}: {
+	bearer_token?: string;
+	taskId: string;
+	data: IRemoveTaskFromManyPlans;
+}) {
 	return serverFetch<IDailyPlan[]>({
 		method: 'PUT',
 		path: `/daily-plan/${taskId}/remove`,
 		body: data,
-		bearer_token,
+		bearer_token
 	});
 }
diff --git a/apps/web/lib/app/init-state.tsx b/apps/web/lib/app/init-state.tsx
@@ -54,7 +54,7 @@ function InitState() {
 	const { firstLoadIssueTypeData } = useIssueType();
 	const { firstLoadTaskRelatedIssueTypeData, loadTaskRelatedIssueTypeData } = useTaskRelatedIssueType();
 
-	const { firstLoadDailyPlanData } = useDailyPlan();
+	const { firstLoadDailyPlanData, getAllDayPlans, getMyDailyPlans, getEmployeeDayPlans } = useDailyPlan();
 	const { firstLoadTimeLogs } = useTimeLogs();
 
 	const { firstLoadDataEmployee } = useEmployee();
@@ -125,6 +125,10 @@ function InitState() {
 			useRefreshIntervalV2(loadTaskRelatedIssueTypeData, sixty_two_seconds, true);
 			useRefreshIntervalV2(loadTaskVersionData, sixty_two_seconds, true);
 
+			useRefreshIntervalV2(getAllDayPlans, sixty_two_seconds, true);
+			useRefreshIntervalV2(getMyDailyPlans, sixty_two_seconds, true);
+			useRefreshIntervalV2(getEmployeeDayPlans, sixty_two_seconds, true);
+
 			return <></>;
 		};
 		return Component;