Skip to content

Amalesh - Timer Refresh Button Hotfix #5243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Amalesh-A wants to merge 4 commits into
base: development
Choose a base branch
from
+12 −7
Open

Amalesh - Timer Refresh Button Hotfix #5243

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e2f5c3
Changing the Timer logic
Amalesh-A May 8, 2026
77acf39
Changing the Timer logic
Amalesh-A May 8, 2026
30e4910
Changed the refresh logic for the disconnected timer
Amalesh-A May 8, 2026
a353e6b
Improved code quality
Amalesh-A May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/components/Timer/Timer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ function Timer({ authUser, darkMode, isPopout }) {
* to CLOSED, and the user will be notified to refresh the page to reconnect to the server.
* */
const [customReadyState, setCustomReadyState] = useState(ReadyState.CONNECTING);
const [wsKey, setWsKey] = useState(0);
const WSoptions = {
share: false,
protocols: localStorage.getItem(config.tokenKey),
Expand All @@ -61,7 +62,10 @@ function Timer({ authUser, darkMode, isPopout }) {

const { sendMessage, sendJsonMessage, lastJsonMessage, getWebSocket } = useWebSocket(
ENDPOINTS.TIMER_SERVICE,
WSoptions,
{
...WSoptions,
queryParams: { reconnect: wsKey },
},
);

// This is the contract between server and client
Expand Down Expand Up @@ -228,8 +232,11 @@ function Timer({ authUser, darkMode, isPopout }) {
);

const handleRefreshTimer = useCallback(() => {
window.location.reload();
}, []);
getWebSocket()?.close();
setCustomReadyState(ReadyState.CONNECTING);
setMessage(defaultMessage);
setWsKey(k => k + 1);
}, [getWebSocket]);

// Initialize session ID on component mount
useEffect(() => {
Expand Down Expand Up @@ -293,8 +300,6 @@ function Timer({ authUser, darkMode, isPopout }) {
() => viewingUserId && !ALLOWED_ROLES_TO_INTERACT.includes(authUser?.role),
[viewingUserId, authUser],
);
// control whether to send GET_TIMER message to avoid message overriding
const isInitialJsonMessageReceived = useMemo(() => !!lastJsonMessage, [lastJsonMessage]);

// Modify the sendStop function to track submitted time
const wsJsonMessageHandler = useMemo(() => {
Expand Down Expand Up @@ -651,10 +656,10 @@ function Timer({ authUser, darkMode, isPopout }) {
}, [weekEndModal]);

useEffect(() => {
if (!isInitialJsonMessageReceived) return;
if (customReadyState !== ReadyState.OPEN) return; // only request when connected

sendGetTimer();
}, [isInitialJsonMessageReceived, viewingUserId]);
}, [customReadyState, viewingUserId, wsKey]);

// Enhanced cleanup when viewing user changes
useEffect(() => {
Expand Down
Loading