Skip to content

Job application tracker and AI-powered job search assistant. Helps job seekers manage their search journey with AI resume review, job matching, task logging, and application analytics, all while keeping your data private.

Autostop activity based on max duration

Khuram Niaza10c4b33765e
diff --git a/src/components/activities/ActivitiesContainer.tsx b/src/components/activities/ActivitiesContainer.tsx
index e965d3a..470da45 100644
--- a/src/components/activities/ActivitiesContainer.tsx
+++ b/src/components/activities/ActivitiesContainer.tsx
@@ -23,6 +23,7 @@ import { toast } from "../ui/use-toast";
import Loading from "../Loading";
import { ActivityBanner } from "./ActivityBanner";
import { differenceInMinutes } from "date-fns";
+import { APP_CONSTANTS } from "@/lib/constants";
function ActivitiesContainer() {
const [activityFormOpen, setActivityFormOpen] = useState<boolean>(false);
@@ -36,6 +37,15 @@ function ActivitiesContainer() {
const closeActivityForm = () => setActivityFormOpen(false);
+ const stopTimer = useCallback(() => {
+ // Clear the timer and reset elapsed time
+ if (timerRef.current) {
+ clearInterval(timerRef.current);
+ timerRef.current = null;
+ }
+ setTimeElapsed(0);
+ }, []);
+
const loadActivities = useCallback(async (page: number) => {
setLoading(true);
try {
@@ -61,59 +71,86 @@ function ActivitiesContainer() {
setLoading(false);
}
}, []);
+
const reloadActivities = useCallback(async () => {
await loadActivities(1);
}, [loadActivities]);
- const fetchActiveActivity = useCallback(async () => {
- const { activity, success } = await getCurrentActivity();
- if (success && activity) {
- setCurrentActivity(activity);
- startTimer(activity.startTime);
- }
- }, []);
-
- useEffect(() => {
- loadActivities(1);
- fetchActiveActivity();
- return () => {
- stopTimer(); // Cleanup the timer on unmount
- };
- }, [loadActivities, fetchActiveActivity]);
+ const stopActivity = useCallback(
+ async (autoStop: boolean = false) => {
+ if (!currentActivity) return;
+ const now = new Date();
+ const maxDurationMinutes =
+ APP_CONSTANTS.ACTIVITY_MAX_DURATION_MS / (1000 * 60);
+ const duration = Math.min(
+ differenceInMinutes(now, currentActivity.startTime),
+ maxDurationMinutes
+ );
+ const { success, message } = await stopActivityById(
+ currentActivity.id!,
+ now,
+ duration
+ );
+ if (success) {
+ stopTimer();
+ setCurrentActivity(undefined);
+ reloadActivities();
+ toast({
+ variant: "success",
+ description: autoStop
+ ? `Activity auto-stopped after reaching maximum duration of ${
+ maxDurationMinutes / 60
+ } hours`
+ : "Activity stopped successfully",
+ });
+ } else {
+ toast({
+ variant: "destructive",
+ title: "Error!",
+ description: message,
+ });
+ }
+ },
+ [currentActivity, reloadActivities, stopTimer]
+ );
- const startTimer = (startTime: number) => {
- // TODO: Check and validate the following at the change of date
- // ALSO: Stop activity when max duration is reached, i.e. 8 hours
- const initialElapsed = Date.now() - startTime;
- setTimeElapsed(initialElapsed);
+ const startTimer = useCallback(
+ (startTime: number) => {
+ const initialElapsed = Date.now() - startTime;
- // Clear any existing timer to avoid duplicates
- if (timerRef.current) {
- clearInterval(timerRef.current);
- }
+ // Check if the initial elapsed time already exceeds the MAX duration
+ if (initialElapsed >= APP_CONSTANTS.ACTIVITY_MAX_DURATION_MS) {
+ setTimeout(() => stopActivity(true), 0);
+ return;
+ }
- // Start the interval timer
- timerRef.current = setInterval(() => {
- setTimeElapsed((prev) => prev + 1000);
- }, 1000);
- };
+ stopTimer(); // Clear any existing timer to avoid duplicates
+ setTimeElapsed(initialElapsed);
- const stopTimer = () => {
- // Clear the timer and reset elapsed time
- if (timerRef.current) {
- clearInterval(timerRef.current);
- timerRef.current = null;
- }
- setTimeElapsed(0);
- };
+ // Start the interval timer
+ timerRef.current = setInterval(() => {
+ setTimeElapsed((prev) => {
+ const newElapsed = prev + 1000;
+ if (newElapsed >= APP_CONSTANTS.ACTIVITY_MAX_DURATION_MS) {
+ clearInterval(timerRef.current!);
+ timerRef.current = null;
+ setTimeout(() => stopActivity(true), 0);
+ return APP_CONSTANTS.ACTIVITY_MAX_DURATION_MS;
+ }
+ return newElapsed;
+ });
+ }, 1000);
+ },
+ [stopActivity, stopTimer]
+ );
const startActivity = async (activityId: string) => {
const { newActivity, success, message } = await startActivityById(
activityId
);
- if (success) {
- setCurrentActivity(newActivity);
- startTimer(newActivity.startTime);
+ if (success && newActivity) {
+ setCurrentActivity(newActivity as Activity);
+ // startTimer(newActivity.startTime); // this happens in useeffect upon currentActivity change
toast({
variant: "success",
description: "Activity started successfully",
@@ -127,27 +164,31 @@ function ActivitiesContainer() {
}
};
- const stopActivity = async () => {
- if (!currentActivity) return;
- const now = new Date();
- const duration = differenceInMinutes(now, currentActivity.startTime);
- const { success, message } = await stopActivityById(
- currentActivity.id!,
- now,
- duration
- );
- if (success) {
- stopTimer();
- setCurrentActivity(undefined);
- reloadActivities();
- toast({
- variant: "success",
- description: "Activity stopped successfully",
- });
- } else {
- toast({ variant: "destructive", title: "Error!", description: message });
+ const fetchActiveActivity = useCallback(async () => {
+ const { activity, success } = await getCurrentActivity();
+ if (success && activity) {
+ setCurrentActivity(activity);
+ startTimer(activity.startTime.getTime());
}
- };
+ }, [startTimer]);
+
+ useEffect(() => {
+ const init = async () => {
+ await Promise.all([loadActivities(1), fetchActiveActivity()]);
+ };
+ init();
+ return () => {
+ stopTimer(); // Cleanup the timer on unmount
+ };
+ // Need to run this once, so no dependency trigger
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, []);
+
+ useEffect(() => {
+ if (currentActivity) {
+ startTimer(currentActivity.startTime.getTime());
+ }
+ }, [currentActivity, startTimer]);
return (
<Card>
@@ -191,12 +232,24 @@ function ActivitiesContainer() {
elapsedTime={timeElapsed}
/>
)}
- <ActivitiesTable
- activities={activitiesList}
- reloadActivities={reloadActivities}
- onStartActivity={startActivity}
- activityExist={Boolean(currentActivity)}
- />
+ {activitiesList.length && (
+ <>
+ <ActivitiesTable
+ activities={activitiesList}
+ reloadActivities={reloadActivities}
+ onStartActivity={startActivity}
+ activityExist={Boolean(currentActivity)}
+ />
+ <div className="text-xs text-muted-foreground">
+ Showing{" "}
+ <strong>
+ {1} to {activitiesList.length}
+ </strong>{" "}
+ of
+ <strong> {totalActivities}</strong> activities
+ </div>
+ </>
+ )}
{activitiesList.length < totalActivities && (
<div className="flex justify-center p-4">
<Button
diff --git a/src/components/activities/ActivityBanner.tsx b/src/components/activities/ActivityBanner.tsx
index 63a73a4..e40a2b6 100644
--- a/src/components/activities/ActivityBanner.tsx
+++ b/src/components/activities/ActivityBanner.tsx
@@ -7,7 +7,7 @@ type BannerVariant = "success" | "warning" | "error" | "info";
interface BannerProps {
message: string;
variant?: BannerVariant;
- onStopActivity: () => void;
+ onStopActivity: (autoStop: boolean) => void;
elapsedTime: number;
className?: string;
}
@@ -57,7 +57,7 @@ export function ActivityBanner({
"focus:ring-blue-500": variant === "info",
}
)}
- onClick={onStopActivity}
+ onClick={() => onStopActivity(false)}
>
<span className="sr-only">Stop Activity</span>
<CircleStop className="text-red-500" />
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 60a3693..e694b7d 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -9,6 +9,7 @@ import {
export enum APP_CONSTANTS {
RECORDS_PER_PAGE = 10,
ACTIVITY_MAX_DURATION_MINUTES = 8 * 60, // 8 Hours
+ ACTIVITY_MAX_DURATION_MS = 8 * 60 * 60 * 1000, // 8 hours in milliseconds
}
export const SIDEBAR_LINKS = [