Merge pull request #2832 from ever-co/stage

Release

.cspell.json

@@ -187,6 +187,8 @@
 		"Kolkata",
 		"Kosrae",
 		"Koyeb",
+		"Krisp",
+		"krisp",
 		"labore",
 		"Lask",
 		"lastest",
@@ -271,6 +273,7 @@
 		"sentryclirc",
 		"setrole",
 		"Settingfilter",
+		"settingsCloseButton",
 		"setuptools",
 		"setwin",
 		"setwork",

apps/web/app/[locale]/meet/livekit/component.tsx

@@ -20,13 +20,15 @@ function LiveKitPage() {
     const params = useSearchParams();
 
     const onLeave = useCallback(() => {
+        window.localStorage.removeItem('current-room-live-kit');
         router.push('/');
     }, [router]);
 
     useEffect(() => {
         const room = params.get("roomName");
         if (room) {
             setRoomName(room);
+            window.localStorage.setItem('current-room-live-kit', room);
         }
     }, [params]);
 
@@ -36,7 +38,7 @@ function LiveKitPage() {
     });
 
     return (
-        <>
+        <div >
             <Meta title="Meet" />
             {token && roomName && <LiveKit
                 token={token!}
@@ -51,7 +53,7 @@ function LiveKitPage() {
                     videoDeviceId: ''
                 }}
             />}
-        </>
+        </div>
     );
 }
 

apps/web/app/hooks/features/useManualTime.ts

@@ -0,0 +1,38 @@
+import { useCallback, useState } from 'react';
+import { useQuery } from '../useQuery';
+import { useAuthenticateUser } from './useAuthenticateUser';
+import { addManualTimeRequestAPI } from '@app/services/client/api/timer/manual-time';
+import { IAddManualTimeRequest, ITimeLog } from '@app/interfaces/timer/ITimerLogs';
+import { TimeLogType, TimerSource } from '@app/interfaces';
+
+export function useManualTime() {
+	const { user } = useAuthenticateUser();
+
+	const { loading: addManualTimeLoading, queryCall: queryAddManualTime } = useQuery(addManualTimeRequestAPI);
+	const [timeLog, setTimeLog] = useState<ITimeLog>();
+
+	const addManualTime = useCallback(
+		(data: Omit<IAddManualTimeRequest, 'tenantId' | 'employeeId' | 'logType' | 'source'>) => {
+			queryAddManualTime({
+				tenantId: user?.tenantId ?? '',
+				employeeId: user?.employee.id ?? '',
+				logType: TimeLogType.MANUAL,
+				source: TimerSource.BROWSER,
+				...data
+			})
+				.then((response) => {
+					setTimeLog(response.data);
+				})
+				.catch((error) => {
+					console.log(error);
+				});
+		},
+		[queryAddManualTime, user?.employee.id, user?.tenantId]
+	);
+
+	return {
+		addManualTimeLoading,
+		addManualTime,
+		timeLog
+	};
+}

apps/web/app/hooks/features/useStartStopTimerHandler.ts

@@ -62,11 +62,34 @@ export function useStartStopTimerHandler() {
 			window && window?.localStorage.getItem(DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE);
 
 		/**
-		 * Handle missing working hour for a daily plN
+		 * Handle missing working hour for a daily plan
 		 */
 		const handleMissingDailyPlanWorkHour = () => {
-			if (!hasWorkedHours) {
-				openAddDailyPlanWorkHoursModal();
+			if (hasPlan) {
+				if (!hasWorkedHours) {
+					openAddDailyPlanWorkHoursModal();
+				} else {
+					startTimer();
+				}
+			} else {
+				startTimer();
+			}
+		};
+
+		/**
+		 * Handle missing estimation hours for tasks
+		 */
+		const handleMissingTasksEstimationHours = () => {
+			if (hasPlan) {
+				if (areAllTasksEstimated) {
+					if (dailyPlanEstimateHoursModalDate != currentDate) {
+						handleMissingDailyPlanWorkHour();
+					} else {
+						startTimer();
+					}
+				} else {
+					openAddTasksEstimationHoursModal();
+				}
 			} else {
 				startTimer();
 			}
@@ -90,20 +113,20 @@ export function useStartStopTimerHandler() {
 				startTimer();
 			} else {
 				if (dailyPlanSuggestionModalDate != currentDate) {
-					openSuggestDailyPlanModal();
+					if (!hasPlan) {
+						openSuggestDailyPlanModal();
+					} else {
+						handleMissingTasksEstimationHours();
+					}
 				} else if (tasksEstimateHoursModalDate != currentDate) {
-					if (areAllTasksEstimated) {
-						if (dailyPlanEstimateHoursModalDate != currentDate) {
+					handleMissingTasksEstimationHours();
+				} else if (dailyPlanEstimateHoursModalDate != currentDate) {
+					if (hasPlan) {
+						if (areAllTasksEstimated) {
 							handleMissingDailyPlanWorkHour();
 						} else {
 							startTimer();
 						}
-					} else {
-						openAddTasksEstimationHoursModal();
-					}
-				} else if (dailyPlanEstimateHoursModalDate != currentDate) {
-					if (areAllTasksEstimated) {
-						handleMissingDailyPlanWorkHour();
 					} else {
 						startTimer();
 					}
@@ -116,6 +139,7 @@ export function useStartStopTimerHandler() {
 	}, [
 		areAllTasksEstimated,
 		canRunTimer,
+		hasPlan,
 		hasWorkedHours,
 		isActiveTaskPlaned,
 		openAddDailyPlanWorkHoursModal,

apps/web/app/interfaces/ITimer.ts

@@ -33,6 +33,13 @@ export enum TimerSource {
 	'TEAMS' = 'TEAMS'
 }
 
+export enum TimeLogType {
+	TRACKED = 'TRACKED',
+	MANUAL = 'MANUAL',
+	IDLE = 'IDLE',
+	RESUMED = 'RESUMED'
+}
+
 export interface ITimerStatus {
 	duration: number;
 	lastLog?: ITimer;

apps/web/app/interfaces/timer/ITimerLogs.ts

@@ -1,3 +1,9 @@
+import { IEmployee } from '../IEmployee';
+import { IOrganization } from '../IOrganization';
+import { ITeamTask } from '../ITask';
+import { TimeLogType, TimerSource } from '../ITimer';
+import { ITimerSlot } from './ITimerSlot';
+
 export interface ITimerLogsDailyReportRequest {
 	tenantId: string;
 	organizationId: string;
@@ -11,3 +17,43 @@ export interface ITimerLogsDailyReport {
 	date: string; // '2024-07-19'
 	sum: number; // in seconds
 }
+
+export interface IAddManualTimeRequest {
+	employeeId: string;
+	projectId?: string;
+	taskId?: string;
+	organizationContactId?: string;
+	description?: string;
+	reason?: string;
+	startedAt: Date;
+	stoppedAt: Date;
+	editedAt?: Date;
+	tags?: string[];
+	isBillable?: boolean;
+	organizationId?: string;
+	organization?: Pick<IOrganization, 'id'>;
+	tenantId?: string;
+	logType: TimeLogType;
+	source: TimerSource.BROWSER;
+}
+
+export interface ITimeLog {
+	employee: IEmployee;
+	employeeId: string;
+	timesheetId?: string;
+	task?: ITeamTask;
+	taskId?: string;
+	timeSlots?: ITimerSlot[];
+	projectId?: string;
+	startedAt?: Date;
+	stoppedAt?: Date;
+	/** Edited At* */
+	editedAt?: Date;
+	description?: string;
+	reason?: string;
+	duration: number;
+	isBillable: boolean;
+	tags?: string[];
+	isRunning?: boolean;
+	isEdited?: boolean;
+}

apps/web/app/services/client/api/timer/manual-time.ts

@@ -0,0 +1,13 @@
+import { post } from '@app/services/client/axios';
+import { IAddManualTimeRequest, ITimeLog } from '@app/interfaces/timer/ITimerLogs';
+
+export async function addManualTimeRequestAPI(request: IAddManualTimeRequest) {
+	const { startedAt, stoppedAt, ...rest } = request;
+	const data = {
+		...rest,
+		startedAt: startedAt.toISOString(),
+		stoppedAt: stoppedAt.toISOString()
+	};
+
+	return post<ITimeLog>(`/timesheet/time-log`, data);
+}

apps/web/components/shared/collaborate/index.tsx

@@ -55,6 +55,15 @@ const Collaborate = () => {
 		[collaborativeMembers, members, setCollaborativeMembers]
 	);
 
+	const handleAction = (actionCallback: () => void) => () => {
+		closeModal();
+		actionCallback();
+	};
+
+	const handleMeetClick = handleAction(onMeetClick);
+	const handleBoardClick = handleAction(onBoardClick);
+
+
 	return (
 		<div>
 			<JitsuAnalytics user={user} />
@@ -197,10 +206,7 @@ const Collaborate = () => {
 
 						<div className="flex space-x-3 ">
 							<Button
-								onClick={() => {
-									closeModal();
-									onMeetClick();
-								}}
+								onClick={handleMeetClick}
 								className={clsxm('rounded-xl flex min-w-0 w-28 h-12', 'gap-1 items-center')}
 								variant="outline"
 							>
@@ -209,10 +215,7 @@ const Collaborate = () => {
 							</Button>
 
 							<Button
-								onClick={() => {
-									closeModal();
-									onBoardClick();
-								}}
+								onClick={handleBoardClick}
 								className={clsxm('rounded-xl flex min-w-0 w-28 h-12', 'gap-1 items-center')}
 							>
 								<BrushSquareIcon className="w-4 h-4" />