Skip to content

update driver arrival ui #256

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

Merged
davixcky merged 1 commit into from
Jan 15, 2025
Merged

update driver arrival ui #256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions services/frontend/react_app/src/hooks/useGetRequestArrival.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,25 @@ export const useGetRequestArrival = (logs: Log[]) => {
const parseDriverLogService = (entry: LogEntry) => {
if (entry.service !== 'driver') return;

const timeRegex = /(\d+)m(\d+)s/;
const match = entry.status.match(timeRegex);
const rawTimeMatch = entry.status.match(/(\d+m\d+s|\d+m|\d+s)/);

if (!match) return;
if (!rawTimeMatch) return; // No substring that looks like time

const rawTime = rawTimeMatch[0];

const minutes = parseInt(match[1], 10);
const seconds = parseInt(match[2], 10);
/**
* Possible cases
* 3m
* 3m2s
* 2s
* */
const timeRegex = /^(?:(\d+)m)?(?:(\d+)s)?$/;
const match = rawTime.match(timeRegex);

if (!match) return;

const minutes = parseInt(match[1] || '0', 10);
const seconds = parseInt(match[2] || '0', 10);
return minutes * 60 + seconds;
};

Expand Down
Loading